Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rdb9044469eec189875c903cab7aa7159043cc18b -rb214a6d9050c59707de8e8e5c9aec3e3800fb4a0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision db9044469eec189875c903cab7aa7159043cc18b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b214a6d9050c59707de8e8e5c9aec3e3800fb4a0)
@@ -88,6 +88,42 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Heave.
+        /// </summary>
+        public static string Categories_Heave {
+            get {
+                return ResourceManager.GetString("Categories_Heave", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactoren.
+        /// </summary>
+        public static string Categories_ModelFactors {
+            get {
+                return ResourceManager.GetString("Categories_ModelFactors", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sellmeijer.
+        /// </summary>
+        public static string Categories_Sellmeijer {
+            get {
+                return ResourceManager.GetString("Categories_Sellmeijer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Opbarsten.
+        /// </summary>
+        public static string Categories_Uplift {
+            get {
+                return ResourceManager.GetString("Categories_Uplift", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Wis alle uitvoer.
         /// </summary>
         public static string Clear_all_output {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -rdb9044469eec189875c903cab7aa7159043cc18b -rb214a6d9050c59707de8e8e5c9aec3e3800fb4a0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision db9044469eec189875c903cab7aa7159043cc18b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b214a6d9050c59707de8e8e5c9aec3e3800fb4a0)
@@ -472,4 +472,16 @@
   <data name="PipingInputIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\blue-document-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Categories_Heave" xml:space="preserve">
+    <value>Heave</value>
+  </data>
+  <data name="Categories_ModelFactors" xml:space="preserve">
+    <value>Modelfactoren</value>
+  </data>
+  <data name="Categories_Sellmeijer" xml:space="preserve">
+    <value>Sellmeijer</value>
+  </data>
+  <data name="Categories_Uplift" xml:space="preserve">
+    <value>Opbarsten</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputParametersContextProperties.cs
===================================================================
diff -u -r4f48ea35b4937263954973396e267934ca7bdb55 -rb214a6d9050c59707de8e8e5c9aec3e3800fb4a0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputParametersContextProperties.cs	(.../PipingInputParametersContextProperties.cs)	(revision 4f48ea35b4937263954973396e267934ca7bdb55)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputParametersContextProperties.cs	(.../PipingInputParametersContextProperties.cs)	(revision b214a6d9050c59707de8e8e5c9aec3e3800fb4a0)
@@ -17,23 +17,47 @@
 {
     public class PipingInputParametersContextProperties : ObjectProperties<PipingInputParametersContext>
     {
+        #region General
+
+        [Editor(typeof(PipingInputParametersContextSurfaceLineSelectionEditor), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_WaterVolumetricWeight_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_WaterVolumetricWeight_Description")]
-        public double WaterVolumetricWeight
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SurfaceLine_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_SurfaceLine_Description")]
+        public RingtoetsPipingSurfaceLine SurfaceLine
         {
             get
             {
-                return data.WrappedPipingInputParameters.WaterVolumetricWeight;
+                return data.WrappedPipingInputParameters.SurfaceLine;
             }
             set
             {
-                data.WrappedPipingInputParameters.WaterVolumetricWeight = value;
+                data.WrappedPipingInputParameters.SurfaceLine = value;
                 data.WrappedPipingInputParameters.NotifyObservers();
             }
         }
 
+        [Editor(typeof(PipingInputParametersContextSoilProfileSelectionEditor), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SoilProfile_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_SoilProfile_Description")]
+        public PipingSoilProfile SoilProfile
+        {
+            get
+            {
+                return data.WrappedPipingInputParameters.SoilProfile;
+            }
+            set
+            {
+                data.WrappedPipingInputParameters.SoilProfile = value;
+                data.WrappedPipingInputParameters.NotifyObservers();
+            }
+        }
+
+        #endregion
+
+        #region Model Factors
+
+        [ResourcesCategory(typeof(Resources), "Categories_ModelFactors")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_UpliftModelFactor_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_UpliftModelFactor_Description")]
         public double UpliftModelFactor
@@ -49,133 +73,247 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_AssessmentLevel_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_AssessmentLevel_Description")]
-        public double AssessmentLevel
+        [ResourcesCategory(typeof(Resources), "Categories_ModelFactors")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SellmeijerModelFactor_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_SellmeijerModelFactor_Description")]
+        public double SellmeijerModelFactor
         {
             get
             {
-                return data.WrappedPipingInputParameters.AssessmentLevel;
+                return data.WrappedPipingInputParameters.SellmeijerModelFactor;
             }
             set
             {
-                data.WrappedPipingInputParameters.AssessmentLevel = value;
+                data.WrappedPipingInputParameters.SellmeijerModelFactor = value;
                 data.WrappedPipingInputParameters.NotifyObservers();
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        #endregion
+
+        #region Heave
+
+        [ResourcesCategory(typeof(Resources), "Categories_Heave")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_CriticalHeaveGradient_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_CriticalHeaveGradient_Description")]
+        public double CriticalHeaveGradient
+        {
+            get
+            {
+                return data.WrappedPipingInputParameters.CriticalHeaveGradient;
+            }
+        }
+
+        [ResourcesCategory(typeof(Resources), "Categories_Heave")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PiezometricHeadExit_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_PiezometricHeadExit_Description")]
-        public double PiezometricHeadExit
+        public double PiezometricHeadExitHeave
         {
             get
             {
-                return data.WrappedPipingInputParameters.PiezometricHeadExit;
+                return PiezometricHeadExit;
             }
             set
             {
-                data.WrappedPipingInputParameters.PiezometricHeadExit = value;
-                data.WrappedPipingInputParameters.NotifyObservers();
+                PiezometricHeadExit = value;
             }
         }
 
         [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Heave")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_ThicknessCoverageLayer_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_ThicknessCoverageLayer_Description")]
+        public DesignVariable<LognormalDistribution> ThicknessCoverageLayerHeave
+        {
+            get
+            {
+                return ThicknessCoverageLayer;
+            }
+            set
+            {
+                ThicknessCoverageLayer = value;
+            }
+        }
+
+        [ResourcesCategory(typeof(Resources), "Categories_Heave")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PiezometricHeadPolder_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_PiezometricHeadPolder_Description")]
+        public double PiezometricHeadPolderHeave
+        {
+            get
+            {
+                return PiezometricHeadPolder;
+            }
+            set
+            {
+                PiezometricHeadPolder = value;
+            }
+        }
+
+        [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
+        [ResourcesCategory(typeof(Resources), "Categories_Heave")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_DampingFactorExit_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_DampingFactorExit_Description")]
-        public DesignVariable<LognormalDistribution> DampingFactorExit
+        public DesignVariable<LognormalDistribution> DampingFactorExitHeave
         {
             get
             {
-                return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedPipingInputParameters);
+                return DampingFactorExit;
             }
             set
             {
-                data.WrappedPipingInputParameters.DampingFactorExit = value.Distribution;
-                data.WrappedPipingInputParameters.NotifyObservers();
+                DampingFactorExit = value;
             }
         }
 
         [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Heave")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PhreaticLevelExit_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_PhreaticLevelExit_Description")]
-        public DesignVariable<NormalDistribution> PhreaticLevelExit
+        public DesignVariable<NormalDistribution> PhreaticLevelExitHeave
         {
             get
             {
-                return PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(data.WrappedPipingInputParameters);
+                return PhreaticLevelExit;
             }
             set
             {
-                data.WrappedPipingInputParameters.PhreaticLevelExit = value.Distribution;
-                data.WrappedPipingInputParameters.NotifyObservers();
+                PhreaticLevelExit = value;
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PiezometricHeadPolder_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_PiezometricHeadPolder_Description")]
-        public double PiezometricHeadPolder
+        #endregion
+
+        #region Uplift 
+
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_WaterVolumetricWeight_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_WaterVolumetricWeight_Description")]
+        public double WaterVolumetricWeightUplift
         {
             get
             {
-                return data.WrappedPipingInputParameters.PiezometricHeadPolder;
+                return WaterVolumetricWeight;
             }
             set
             {
-                data.WrappedPipingInputParameters.PiezometricHeadPolder = value;
-                data.WrappedPipingInputParameters.NotifyObservers();
+                WaterVolumetricWeight = value;
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_CriticalHeaveGradient_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_CriticalHeaveGradient_Description")]
-        public double CriticalHeaveGradient
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_AssessmentLevel_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_AssessmentLevel_Description")]
+        public double AssessmentLevelUplift
         {
             get
             {
-                return data.WrappedPipingInputParameters.CriticalHeaveGradient;
+                return AssessmentLevel;
             }
+            set
+            {
+                AssessmentLevel = value;
+            }
         }
 
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PiezometricHeadExit_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_PiezometricHeadExit_Description")]
+        public double PiezometricHeadExitUplift
+        {
+            get
+            {
+                return PiezometricHeadExit;
+            }
+            set
+            {
+                PiezometricHeadExit = value;
+            }
+        }
+
         [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_ThicknessCoverageLayer_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_ThicknessCoverageLayer_Description")]
-        public DesignVariable<LognormalDistribution> ThicknessCoverageLayer
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_DampingFactorExit_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_DampingFactorExit_Description")]
+        public DesignVariable<LognormalDistribution> DampingFactorExitUplift
         {
             get
             {
-                return PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(data.WrappedPipingInputParameters);
+                return DampingFactorExit;
             }
             set
             {
-                data.WrappedPipingInputParameters.ThicknessCoverageLayer = value.Distribution;
-                data.WrappedPipingInputParameters.NotifyObservers();
+                DampingFactorExit = value;
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SellmeijerModelFactor_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_SellmeijerModelFactor_Description")]
-        public double SellmeijerModelFactor
+        [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))]
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PhreaticLevelExit_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_PhreaticLevelExit_Description")]
+        public DesignVariable<NormalDistribution> PhreaticLevelExitUplift
         {
             get
             {
-                return data.WrappedPipingInputParameters.SellmeijerModelFactor;
+                return PhreaticLevelExit;
             }
             set
             {
-                data.WrappedPipingInputParameters.SellmeijerModelFactor = value;
-                data.WrappedPipingInputParameters.NotifyObservers();
+                PhreaticLevelExit = value;
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PiezometricHeadPolder_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_PiezometricHeadPolder_Description")]
+        public double PiezometricHeadPolderUplift
+        {
+            get
+            {
+                return PiezometricHeadPolder;
+            }
+            set
+            {
+                PiezometricHeadPolder = value;
+            }
+        }
+
+        #endregion
+
+        #region Sellmeijer
+
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_AssessmentLevel_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_AssessmentLevel_Description")]
+        public double AssessmentLevelSellmeijer
+        {
+            get
+            {
+                return AssessmentLevel;
+            }
+            set
+            {
+                AssessmentLevel = value;
+            }
+        }
+
+        [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_PhreaticLevelExit_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_PhreaticLevelExit_Description")]
+        public DesignVariable<NormalDistribution> PhreaticLevelExitSellmeijer
+        {
+            get
+            {
+                return PhreaticLevelExit;
+            }
+            set
+            {
+                PhreaticLevelExit = value;
+            }
+        }
+
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SellmeijerReductionFactor_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_SellmeijerReductionFactor_Description")]
         public double SellmeijerReductionFactor
@@ -192,7 +330,23 @@
         }
 
         [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_ThicknessCoverageLayer_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_ThicknessCoverageLayer_Description")]
+        public DesignVariable<LognormalDistribution> ThicknessCoverageLayerSellmeijer
+        {
+            get
+            {
+                return ThicknessCoverageLayer;
+            }
+            set
+            {
+                ThicknessCoverageLayer = value;
+            }
+        }
+
+        [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SeepageLength_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_SeepageLength_Description")]
         public DesignVariable<LognormalDistribution> SeepageLength
@@ -208,7 +362,7 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SandParticlesVolumicWeight_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_SandParticlesVolumicWeight_Description")]
         public double SandParticlesVolumicWeight
@@ -224,7 +378,7 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_WhitesDragCoefficient_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_WhitesDragCoefficient_Description")]
         public double WhitesDragCoefficient
@@ -241,7 +395,7 @@
         }
 
         [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_Diameter70_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_Diameter70_Description")]
         public DesignVariable<LognormalDistribution> Diameter70
@@ -257,8 +411,23 @@
             }
         }
 
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
+        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_WaterVolumetricWeight_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "PipingInputParameters_WaterVolumetricWeight_Description")]
+        public double WaterVolumetricWeightSellmeijer
+        {
+            get
+            {
+                return WaterVolumetricWeight;
+            }
+            set
+            {
+                WaterVolumetricWeight = value;
+            }
+        }
+
         [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_DarcyPermeability_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_DarcyPermeability_Description")]
         public DesignVariable<LognormalDistribution> DarcyPermeability
@@ -274,7 +443,7 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_WaterKinematicViscosity_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_WaterKinematicViscosity_Description")]
         public double WaterKinematicViscosity
@@ -290,7 +459,7 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_Gravity_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_Gravity_Description")]
         public double Gravity
@@ -307,7 +476,7 @@
         }
 
         [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_ThicknessAquiferLayer_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_ThicknessAquiferLayer_Description")]
         public DesignVariable<LognormalDistribution> ThicknessAquiferLayer
@@ -323,7 +492,7 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_MeanDiameter70_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_MeanDiameter70_Description")]
         public double MeanDiameter70
@@ -339,7 +508,7 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_BeddingAngle_DisplayName")]
         [ResourcesDescription(typeof(Resources), "PipingInputParameters_BeddingAngle_Description")]
         public double BeddingAngle
@@ -355,54 +524,113 @@
             }
         }
 
-        [Editor(typeof(PipingInputParametersContextSurfaceLineSelectionEditor), typeof(UITypeEditor))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SurfaceLine_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_SurfaceLine_Description")]
-        public RingtoetsPipingSurfaceLine SurfaceLine
+#endregion
+
+        /// <summary>
+        /// Gets the available surface lines on <see cref="PipingCalculationInputs"/>.
+        /// </summary>
+        public IEnumerable<RingtoetsPipingSurfaceLine> GetAvailableSurfaceLines()
         {
+            return data.AvailablePipingSurfaceLines;
+        }
+
+        /// <summary>
+        /// Gets the available soil profiles on <see cref="PipingCalculationInputs"/>.
+        /// </summary>
+        public IEnumerable<PipingSoilProfile> GetAvailableSoilProfiles()
+        {
+            return data.AvailablePipingSoilProfiles;
+        }
+
+        private double WaterVolumetricWeight
+        {
             get
             {
-                return data.WrappedPipingInputParameters.SurfaceLine;
+                return data.WrappedPipingInputParameters.WaterVolumetricWeight;
             }
             set
             {
-                data.WrappedPipingInputParameters.SurfaceLine = value;
+                data.WrappedPipingInputParameters.WaterVolumetricWeight = value;
                 data.WrappedPipingInputParameters.NotifyObservers();
             }
         }
 
-        [Editor(typeof(PipingInputParametersContextSoilProfileSelectionEditor), typeof(UITypeEditor))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "PipingInputParameters_SoilProfile_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "PipingInputParameters_SoilProfile_Description")]
-        public PipingSoilProfile SoilProfile
+        private double PiezometricHeadPolder
         {
             get
             {
-                return data.WrappedPipingInputParameters.SoilProfile;
+                return data.WrappedPipingInputParameters.PiezometricHeadPolder;
             }
             set
             {
-                data.WrappedPipingInputParameters.SoilProfile = value;
+                data.WrappedPipingInputParameters.PiezometricHeadPolder = value;
                 data.WrappedPipingInputParameters.NotifyObservers();
             }
         }
 
-        /// <summary>
-        /// Gets the available surface lines on <see cref="PipingCalculationInputs"/>.
-        /// </summary>
-        public IEnumerable<RingtoetsPipingSurfaceLine> GetAvailableSurfaceLines()
+        private double AssessmentLevel
         {
-            return data.AvailablePipingSurfaceLines;
+            get
+            {
+                return data.WrappedPipingInputParameters.AssessmentLevel;
+            }
+            set
+            {
+                data.WrappedPipingInputParameters.AssessmentLevel = value;
+                data.WrappedPipingInputParameters.NotifyObservers();
+            }
         }
 
-        /// <summary>
-        /// Gets the available soil profiles on <see cref="PipingCalculationInputs"/>.
-        /// </summary>
-        public IEnumerable<PipingSoilProfile> GetAvailableSoilProfiles()
+        private double PiezometricHeadExit
         {
-            return data.AvailablePipingSoilProfiles;
+            get
+            {
+                return data.WrappedPipingInputParameters.PiezometricHeadExit;
+            }
+            set
+            {
+                data.WrappedPipingInputParameters.PiezometricHeadExit = value;
+                data.WrappedPipingInputParameters.NotifyObservers();
+            }
         }
+
+        private DesignVariable<LognormalDistribution> DampingFactorExit
+        {
+            get
+            {
+                return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedPipingInputParameters);
+            }
+            set
+            {
+                data.WrappedPipingInputParameters.DampingFactorExit = value.Distribution;
+                data.WrappedPipingInputParameters.NotifyObservers();
+            }
+        }
+
+        private DesignVariable<NormalDistribution> PhreaticLevelExit
+        {
+            get
+            {
+                return PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(data.WrappedPipingInputParameters);
+            }
+            set
+            {
+                data.WrappedPipingInputParameters.PhreaticLevelExit = value.Distribution;
+                data.WrappedPipingInputParameters.NotifyObservers();
+            }
+        }
+
+        private DesignVariable<LognormalDistribution> ThicknessCoverageLayer
+        {
+            get
+            {
+                return PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(data.WrappedPipingInputParameters);
+            }
+            set
+            {
+                data.WrappedPipingInputParameters.ThicknessCoverageLayer = value.Distribution;
+                data.WrappedPipingInputParameters.NotifyObservers();
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputParametersContextPropertiesTest.cs
===================================================================
diff -u -r4f48ea35b4937263954973396e267934ca7bdb55 -rb214a6d9050c59707de8e8e5c9aec3e3800fb4a0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputParametersContextPropertiesTest.cs	(.../PipingInputParametersContextPropertiesTest.cs)	(revision 4f48ea35b4937263954973396e267934ca7bdb55)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputParametersContextPropertiesTest.cs	(.../PipingInputParametersContextPropertiesTest.cs)	(revision b214a6d9050c59707de8e8e5c9aec3e3800fb4a0)
@@ -55,25 +55,33 @@
             };
 
             // Call & Assert
-            Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExit.Distribution);
-            Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExit.Distribution);
-            Assert.AreSame(inputParameters.ThicknessCoverageLayer, properties.ThicknessCoverageLayer.Distribution);
+            Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExitHeave.Distribution);
+            Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExitSellmeijer.Distribution);
+            Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExitUplift.Distribution);
+            Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExitUplift.Distribution);
+            Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExitHeave.Distribution);
+            Assert.AreSame(inputParameters.ThicknessCoverageLayer, properties.ThicknessCoverageLayerHeave.Distribution);
+            Assert.AreSame(inputParameters.ThicknessCoverageLayer, properties.ThicknessCoverageLayerSellmeijer.Distribution);
             Assert.AreSame(inputParameters.SeepageLength, properties.SeepageLength.Distribution);
             Assert.AreSame(inputParameters.Diameter70, properties.Diameter70.Distribution);
             Assert.AreSame(inputParameters.DarcyPermeability, properties.DarcyPermeability.Distribution);
             Assert.AreSame(inputParameters.ThicknessAquiferLayer, properties.ThicknessAquiferLayer.Distribution);
 
             Assert.AreEqual(inputParameters.UpliftModelFactor, properties.UpliftModelFactor);
-            Assert.AreEqual(inputParameters.PiezometricHeadExit, properties.PiezometricHeadExit);
-            Assert.AreEqual(inputParameters.PiezometricHeadPolder, properties.PiezometricHeadPolder);
-            Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevel);
+            Assert.AreEqual(inputParameters.PiezometricHeadExit, properties.PiezometricHeadExitHeave);
+            Assert.AreEqual(inputParameters.PiezometricHeadExit, properties.PiezometricHeadExitUplift);
+            Assert.AreEqual(inputParameters.PiezometricHeadPolder, properties.PiezometricHeadPolderHeave);
+            Assert.AreEqual(inputParameters.PiezometricHeadPolder, properties.PiezometricHeadPolderUplift);
+            Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevelSellmeijer);
+            Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevelUplift);
             Assert.AreEqual(inputParameters.SellmeijerModelFactor, properties.SellmeijerModelFactor);
 
             Assert.AreEqual(inputParameters.CriticalHeaveGradient, properties.CriticalHeaveGradient);
             Assert.AreEqual(inputParameters.SellmeijerReductionFactor, properties.SellmeijerReductionFactor);
             Assert.AreEqual(inputParameters.Gravity, properties.Gravity);
             Assert.AreEqual(inputParameters.WaterKinematicViscosity, properties.WaterKinematicViscosity);
-            Assert.AreEqual(inputParameters.WaterVolumetricWeight, properties.WaterVolumetricWeight);
+            Assert.AreEqual(inputParameters.WaterVolumetricWeight, properties.WaterVolumetricWeightSellmeijer);
+            Assert.AreEqual(inputParameters.WaterVolumetricWeight, properties.WaterVolumetricWeightUplift);
             Assert.AreEqual(inputParameters.SandParticlesVolumicWeight, properties.SandParticlesVolumicWeight);
             Assert.AreEqual(inputParameters.WhitesDragCoefficient, properties.WhitesDragCoefficient);
             Assert.AreEqual(inputParameters.BeddingAngle, properties.BeddingAngle);
@@ -101,7 +109,7 @@
 
             // Call & Assert
             const double assessmentLevel = 0.12;
-            properties.AssessmentLevel = assessmentLevel;
+            properties.AssessmentLevelSellmeijer = assessmentLevel;
             Assert.AreEqual(assessmentLevel, inputParameters.AssessmentLevel);
             mocks.VerifyAll();
         }
@@ -112,7 +120,7 @@
             // Setup
             var mocks = new MockRepository();
             var projectObserver = mocks.StrictMock<IObserver>();
-            int numberProperties = 21;
+            int numberProperties = 22;
             projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
             mocks.ReplayAll();
 
@@ -121,6 +129,7 @@
 
             Random random = new Random(22);
 
+            double assessmentLevel = random.NextDouble();
             double waterVolumetricWeight = random.NextDouble();
             double upliftModelFactor = random.NextDouble();
             double piezometricHeadExit = random.NextDouble();
@@ -149,13 +158,14 @@
             new PipingInputParametersContextProperties
             {
                 Data = new PipingInputParametersContext{WrappedPipingInputParameters = inputParameters},
-                WaterVolumetricWeight = waterVolumetricWeight,
+                AssessmentLevelSellmeijer = assessmentLevel,
+                WaterVolumetricWeightUplift = waterVolumetricWeight,
                 UpliftModelFactor = upliftModelFactor,
-                PiezometricHeadExit = piezometricHeadExit,
-                DampingFactorExit = new LognormalDistributionDesignVariable(dampingFactorExit),
-                PhreaticLevelExit = new NormalDistributionDesignVariable(phreaticLevelExit),
-                PiezometricHeadPolder = piezometricHeadPolder,
-                ThicknessCoverageLayer = new LognormalDistributionDesignVariable(thicknessCoverageLayer),
+                PiezometricHeadExitUplift = piezometricHeadExit,
+                DampingFactorExitHeave = new LognormalDistributionDesignVariable(dampingFactorExit),
+                PhreaticLevelExitHeave = new NormalDistributionDesignVariable(phreaticLevelExit),
+                PiezometricHeadPolderHeave = piezometricHeadPolder,
+                ThicknessCoverageLayerSellmeijer = new LognormalDistributionDesignVariable(thicknessCoverageLayer),
                 SellmeijerModelFactor = sellmeijerModelFactor,
                 SellmeijerReductionFactor = sellmeijerReductionFactor,
                 SeepageLength = new LognormalDistributionDesignVariable(seepageLength),
@@ -173,6 +183,7 @@
             };
 
             // Assert
+            Assert.AreEqual(assessmentLevel, inputParameters.AssessmentLevel);
             Assert.AreEqual(waterVolumetricWeight, inputParameters.WaterVolumetricWeight);
             Assert.AreEqual(upliftModelFactor, inputParameters.UpliftModelFactor);
             Assert.AreEqual(piezometricHeadExit, inputParameters.PiezometricHeadExit);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -r4f48ea35b4937263954973396e267934ca7bdb55 -rb214a6d9050c59707de8e8e5c9aec3e3800fb4a0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs	(.../LognormalDistributionDesignVariableTypeConverterTest.cs)	(revision 4f48ea35b4937263954973396e267934ca7bdb55)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs	(.../LognormalDistributionDesignVariableTypeConverterTest.cs)	(revision b214a6d9050c59707de8e8e5c9aec3e3800fb4a0)
@@ -150,15 +150,15 @@
 
             inputParameters.Attach(observer);
 
-            DesignVariable<LognormalDistribution> dampingFactorExit = inputParameterContextProperties.DampingFactorExit;
-            var properties = new LognormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, dampingFactorExit);
+            DesignVariable<LognormalDistribution> dampingFactorExitHeave = inputParameterContextProperties.DampingFactorExitHeave;
+            var properties = new LognormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, dampingFactorExitHeave);
 
             // Precondition
             Assert.IsNotNull(properties);
 
             // Event
             const double newValue = 2.3;
-            properties[propertyIndexToChange].SetValue(dampingFactorExit, newValue);
+            properties[propertyIndexToChange].SetValue(dampingFactorExitHeave, newValue);
 
             // Result
             switch (propertyIndexToChange)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -r4f48ea35b4937263954973396e267934ca7bdb55 -rb214a6d9050c59707de8e8e5c9aec3e3800fb4a0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs	(.../NormalDistributionDesignVariableTypeConverterTest.cs)	(revision 4f48ea35b4937263954973396e267934ca7bdb55)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs	(.../NormalDistributionDesignVariableTypeConverterTest.cs)	(revision b214a6d9050c59707de8e8e5c9aec3e3800fb4a0)
@@ -149,15 +149,15 @@
 
             inputParameters.Attach(observer);
 
-            DesignVariable<NormalDistribution> designVariable = inputParameterContextProperties.PhreaticLevelExit;
-            PropertyDescriptorCollection properties = new NormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, designVariable);
+            DesignVariable<NormalDistribution> phreaticLevelExitHeave = inputParameterContextProperties.PhreaticLevelExitHeave;
+            PropertyDescriptorCollection properties = new NormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, phreaticLevelExitHeave);
 
             // Precondition
             Assert.IsNotNull(properties);
 
             // Event
             const double newValue = 2.3;
-            properties[propertyIndexToChange].SetValue(designVariable, newValue);
+            properties[propertyIndexToChange].SetValue(phreaticLevelExitHeave, newValue);
 
             // Result
             switch (propertyIndexToChange)