Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.cs
===================================================================
diff -u -rd6acb89a52643cf1790f58249b1202b5cb9263cf -r12472a63885e4314aae3ed0df76bc9ebaf54e91f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.cs)	(revision d6acb89a52643cf1790f58249b1202b5cb9263cf)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.cs)	(revision 12472a63885e4314aae3ed0df76bc9ebaf54e91f)
@@ -35,22 +35,18 @@
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of <see cref="HydraulicBoundaryLocation"/> with a design water level calculation result
+    /// ViewModel of <see cref="HydraulicBoundaryLocationCalculation"/> with a design water level calculation result
     /// for properties panel of the <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
     /// </summary>
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationProperties : GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties
     {
-        private readonly HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation;
-
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsDesignWaterLevelLocationProperties"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location.</param>
-        /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation at stake.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                                           HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
-            : base(hydraulicBoundaryLocation, new ConstructionProperties
+        /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
+        public GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+            : base(hydraulicBoundaryLocationCalculation, new ConstructionProperties
             {
                 IdIndex = 1,
                 NameIndex = 2,
@@ -59,16 +55,8 @@
                 StochastsIndex = 12,
                 DurationsIndex = 13,
                 IllustrationPointsIndex = 14
-            })
-        {
-            if (hydraulicBoundaryLocationCalculation == null)
-            {
-                throw new ArgumentNullException(nameof(hydraulicBoundaryLocationCalculation));
-            }
+            }) {}
 
-            this.hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculation;
-        }
-
         [PropertyOrder(4)]
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
@@ -78,7 +66,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.Result ?? RoundedDouble.NaN;
+                return data.Output?.Result ?? RoundedDouble.NaN;
             }
         }
 
@@ -91,7 +79,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.TargetProbability ?? double.NaN;
+                return data.Output?.TargetProbability ?? double.NaN;
             }
         }
 
@@ -104,7 +92,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.TargetReliability ?? RoundedDouble.NaN;
+                return data.Output?.TargetReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -117,7 +105,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.CalculatedProbability ?? double.NaN;
+                return data.Output?.CalculatedProbability ?? double.NaN;
             }
         }
 
@@ -130,7 +118,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.CalculatedReliability ?? RoundedDouble.NaN;
+                return data.Output?.CalculatedReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -142,7 +130,7 @@
         {
             get
             {
-                CalculationConvergence convergence = hydraulicBoundaryLocationCalculation.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
+                CalculationConvergence convergence = data.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
                 return new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             }
         }
@@ -155,21 +143,20 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated;
+                return data.InputParameters.ShouldIllustrationPointsBeCalculated;
             }
             set
             {
-                hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = value;
+                data.InputParameters.ShouldIllustrationPointsBeCalculated = value;
                 data.NotifyObservers();
             }
         }
 
         protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResult()
         {
-            if (hydraulicBoundaryLocationCalculation.HasOutput
-                && hydraulicBoundaryLocationCalculation.Output.HasGeneralResult)
+            if (data.HasOutput && data.Output.HasGeneralResult)
             {
-                return hydraulicBoundaryLocationCalculation.Output.GeneralResult;
+                return data.Output.GeneralResult;
             }
 
             return null;
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -r538d63807c53774dce1221df64f5ae8788510a1d -r12472a63885e4314aae3ed0df76bc9ebaf54e91f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties.cs)	(revision 538d63807c53774dce1221df64f5ae8788510a1d)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties.cs)	(revision 12472a63885e4314aae3ed0df76bc9ebaf54e91f)
@@ -31,12 +31,14 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.GrassCoverErosionOutwards.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of <see cref="HydraulicBoundaryLocationCalculation"/> for properties panel.
+    /// ViewModel of <see cref="HydraulicBoundaryLocationCalculation"/> for properties panel of the
+    /// <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
     /// </summary>
     [TypeConverter(typeof(ExpandableObjectConverter))]
     public abstract class GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties : ObjectProperties<HydraulicBoundaryLocationCalculation>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationProperties.cs
===================================================================
diff -u -rd6acb89a52643cf1790f58249b1202b5cb9263cf -r12472a63885e4314aae3ed0df76bc9ebaf54e91f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationProperties.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationProperties.cs)	(revision d6acb89a52643cf1790f58249b1202b5cb9263cf)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationProperties.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationProperties.cs)	(revision 12472a63885e4314aae3ed0df76bc9ebaf54e91f)
@@ -35,22 +35,18 @@
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of <see cref="HydraulicBoundaryLocation"/> with a wave height calculation result
+    /// ViewModel of <see cref="HydraulicBoundaryLocationCalculation"/> with a wave height calculation result
     /// for properties panel of the <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
     /// </summary>
     public class GrassCoverErosionOutwardsWaveHeightLocationProperties : GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties
     {
-        private readonly HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation;
-
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveHeightLocationProperties"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location.</param>
-        /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation at stake.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public GrassCoverErosionOutwardsWaveHeightLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                                     HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
-            : base(hydraulicBoundaryLocation, new ConstructionProperties
+        /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
+        public GrassCoverErosionOutwardsWaveHeightLocationProperties(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+            : base(hydraulicBoundaryLocationCalculation, new ConstructionProperties
             {
                 IdIndex = 1,
                 NameIndex = 2,
@@ -59,16 +55,8 @@
                 StochastsIndex = 12,
                 DurationsIndex = 13,
                 IllustrationPointsIndex = 14
-            })
-        {
-            if (hydraulicBoundaryLocationCalculation == null)
-            {
-                throw new ArgumentNullException(nameof(hydraulicBoundaryLocationCalculation));
-            }
+            }) {}
 
-            this.hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculation;
-        }
-
         [PropertyOrder(4)]
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
@@ -78,7 +66,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.Result ?? RoundedDouble.NaN;
+                return data.Output?.Result ?? RoundedDouble.NaN;
             }
         }
 
@@ -91,7 +79,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.TargetProbability ?? double.NaN;
+                return data.Output?.TargetProbability ?? double.NaN;
             }
         }
 
@@ -104,7 +92,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.TargetReliability ?? RoundedDouble.NaN;
+                return data.Output?.TargetReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -117,7 +105,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.CalculatedProbability ?? double.NaN;
+                return data.Output?.CalculatedProbability ?? double.NaN;
             }
         }
 
@@ -130,7 +118,7 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.Output?.CalculatedReliability ?? RoundedDouble.NaN;
+                return data.Output?.CalculatedReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -142,7 +130,7 @@
         {
             get
             {
-                CalculationConvergence convergence = hydraulicBoundaryLocationCalculation.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
+                CalculationConvergence convergence = data.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
                 return new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             }
         }
@@ -155,21 +143,20 @@
         {
             get
             {
-                return hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated;
+                return data.InputParameters.ShouldIllustrationPointsBeCalculated;
             }
             set
             {
-                hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = value;
+                data.InputParameters.ShouldIllustrationPointsBeCalculated = value;
                 data.NotifyObservers();
             }
         }
 
         protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResult()
         {
-            if (hydraulicBoundaryLocationCalculation.HasOutput
-                && hydraulicBoundaryLocationCalculation.Output.HasGeneralResult)
+            if (data.HasOutput && data.Output.HasGeneralResult)
             {
-                return hydraulicBoundaryLocationCalculation.Output.GeneralResult;
+                return data.Output.GeneralResult;
             }
 
             return null;