Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs
===================================================================
diff -u -r3f808e3148ed698fcbe6607d7ce998f142038151 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs	(.../GrassCoverErosionInwardsInput.cs)	(revision 3f808e3148ed698fcbe6607d7ce998f142038151)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs	(.../GrassCoverErosionInwardsInput.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -33,7 +33,8 @@
     /// <summary>
     /// Class that holds all grass cover erosion inwards calculation specific input parameters.
     /// </summary>
-    public class GrassCoverErosionInwardsInput : Observable, ICalculationInput
+    public class GrassCoverErosionInwardsInput : Observable, ICalculationInput, IUseBreakWater,
+                                                 IUseForeshore
     {
         private readonly LogNormalDistribution criticalFlowRate;
         private RoundedDouble orientation;
@@ -90,34 +91,6 @@
         }
 
         /// <summary>
-        /// Gets or sets whether <see cref="BreakWater"/> needs to be taken into account.
-        /// </summary>
-        public bool UseBreakWater { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="BreakWater"/>.
-        /// </summary>
-        public BreakWater BreakWater { get; private set; }
-
-        /// <summary>
-        /// Gets or sets whether the <see cref="ForeshoreGeometry"/> needs to be taken into account.
-        /// </summary>
-        public bool UseForeshore { get; set; }
-
-        /// <summary>
-        /// Gets the geometry of the foreshore.
-        /// </summary>
-        public RoundedPoint2DCollection ForeshoreGeometry
-        {
-            get
-            {
-                return dikeProfile != null
-                           ? dikeProfile.ForeshoreGeometry
-                           : new RoundedPoint2DCollection(2, Enumerable.Empty<Point2D>());
-            }
-        }
-
-        /// <summary>
         /// Gets the geometry of the dike with roughness data.
         /// </summary>
         /// <remarks>
@@ -177,6 +150,34 @@
         /// </summary>
         public bool CalculateDikeHeight { get; set; }
 
+        /// <summary>
+        /// Gets or sets whether <see cref="BreakWater"/> needs to be taken into account.
+        /// </summary>
+        public bool UseBreakWater { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="BreakWater"/>.
+        /// </summary>
+        public BreakWater BreakWater { get; private set; }
+
+        /// <summary>
+        /// Gets or sets whether the <see cref="ForeshoreGeometry"/> needs to be taken into account.
+        /// </summary>
+        public bool UseForeshore { get; set; }
+
+        /// <summary>
+        /// Gets the geometry of the foreshore.
+        /// </summary>
+        public RoundedPoint2DCollection ForeshoreGeometry
+        {
+            get
+            {
+                return dikeProfile != null
+                           ? dikeProfile.ForeshoreGeometry
+                           : new RoundedPoint2DCollection(2, Enumerable.Empty<Point2D>());
+            }
+        }
+
         private void UpdateProfileParameters()
         {
             if (dikeProfile == null)
Fisheye: Tag aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -111,14 +111,11 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_Description")]
-        public GrassCoverErosionInwardsInputContextBreakWaterProperties BreakWater
+        public UseBreakWaterProperties BreakWater
         {
             get
             {
-                return new GrassCoverErosionInwardsInputContextBreakWaterProperties
-                {
-                    Data = data
-                };
+                return new UseBreakWaterProperties(data.WrappedData, UseBreakWaterEnabled);
             }
         }
 
@@ -127,14 +124,11 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_Description")]
-        public GrassCoverErosionInwardsInputContextForeshoreProperties Foreshore
+        public UseForeshoreProperties Foreshore
         {
             get
             {
-                return new GrassCoverErosionInwardsInputContextForeshoreProperties
-                {
-                    Data = data
-                };
+                return new UseForeshoreProperties(data.WrappedData);
             }
         }
 
@@ -238,5 +232,10 @@
         {
             return data.AvailableHydraulicBoundaryLocations;
         }
+
+        private bool UseBreakWaterEnabled()
+        {
+            return data.WrappedData.DikeProfile != null;
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.csproj)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.csproj)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -64,9 +64,7 @@
     <Compile Include="PropertyClasses\DikeProfileProperties.cs" />
     <Compile Include="PropertyClasses\DikeProfileDikeGeometryProperties.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsOutputProperties.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextBreakWaterProperties.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextForeshoreProperties.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsFailureMechanismContextProperties.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextProperties.cs" />
     <Compile Include="UITypeEditors\GrassCoverErosionInwardsInputContextDikeProfileEditor.cs" />
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs
===================================================================
diff -u -r275811c8e133cba03f636224f40a9536a733fb1f -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs	(.../GrassCoverErosionInwardsInputTest.cs)	(revision 275811c8e133cba03f636224f40a9536a733fb1f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs	(.../GrassCoverErosionInwardsInputTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -43,6 +43,8 @@
             // Assert
             Assert.IsInstanceOf<Observable>(input);
             Assert.IsInstanceOf<ICalculationInput>(input);
+            Assert.IsInstanceOf<IUseBreakWater>(input);
+            Assert.IsInstanceOf<IUseForeshore>(input);
 
             Assert.IsNull(input.DikeProfile);
             Assert.AreEqual(new RoundedDouble(2), input.Orientation);
Fisheye: Tag aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r679173a47bec16eebaf4be2ddedf42de87788456 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 679173a47bec16eebaf4be2ddedf42de87788456)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -28,6 +28,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses;
@@ -92,8 +93,8 @@
             Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
             Assert.IsNull(properties.DikeProfile);
             Assert.AreEqual(0.0, properties.Orientation.Value);
-            Assert.AreSame(inputContext, properties.BreakWater.Data);
-            Assert.AreSame(inputContext, properties.Foreshore.Data);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
+            Assert.IsInstanceOf<UseForeshoreProperties>(properties.Foreshore);
             Assert.AreSame(inputContext, properties.DikeGeometry.Data);
             Assert.AreEqual(2, properties.DikeHeight.NumberOfDecimalPlaces);
             Assert.AreEqual(0.0, properties.DikeHeight.Value);
@@ -132,8 +133,8 @@
             Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
             Assert.AreSame(input.DikeProfile, properties.DikeProfile);
             Assert.AreEqual(0.0, properties.Orientation.Value);
-            Assert.AreSame(inputContext, properties.BreakWater.Data);
-            Assert.AreSame(inputContext, properties.Foreshore.Data);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.Foreshore);
             Assert.AreSame(inputContext, properties.DikeGeometry.Data);
             Assert.AreEqual(2, properties.DikeHeight.NumberOfDecimalPlaces);
             Assert.AreEqual(0.0, properties.DikeHeight.Value);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj
===================================================================
diff -u -r6b9fda141298524c0910937dd090d82be420c52b -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision 6b9fda141298524c0910937dd090d82be420c52b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -69,15 +69,13 @@
     <Compile Include="PropertyClasses\DikeProfilePropertiesTest.cs" />
     <Compile Include="PropertyClasses\DikeProfileDikeGeometryPropertiesTest.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs" />
     <Compile Include="PresentationObjects\GrassCoverErosionInwardsCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\GrassCoverErosionInwardsCalculationGroupContextTest.cs" />
     <Compile Include="PresentationObjects\GrassCoverErosionInwardsContextTest.cs" />
     <Compile Include="PresentationObjects\GrassCoverErosionInwardsFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\GrassCoverErosionInwardsInputContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs" />
     <Compile Include="TreeNodeInfos\DikeProfilesContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -32,6 +32,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
@@ -105,8 +106,8 @@
             Assert.IsNull(properties.WorldReferencePoint);
             Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
             Assert.AreEqual(0, properties.Orientation.Value);
-            Assert.AreSame(input, properties.BreakWater.Data);
-            Assert.AreSame(input, properties.ForeshoreGeometry.Data);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
+            Assert.IsInstanceOf<UseForeshoreProperties>(properties.ForeshoreGeometry);
             Assert.AreEqual("Gras", properties.RevetmentType);
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -r0d12e759b6e46290d83d04a6a5760fe467b339ab -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 0d12e759b6e46290d83d04a6a5760fe467b339ab)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -25,6 +25,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.HydraRing.Data;
@@ -43,6 +44,8 @@
             // Assert
             Assert.IsInstanceOf<Observable>(input);
             Assert.IsInstanceOf<ICalculationInput>(input);
+            Assert.IsInstanceOf<IUseBreakWater>(input);
+            Assert.IsInstanceOf<IUseForeshore>(input);
             Assert.IsNull(input.HydraulicBoundaryLocation);
 
             AssertAreEqual(0, input.StructureNormalOrientation);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -ree9ea66795cde20ae1bd8a096333476e49d0d558 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision ee9ea66795cde20ae1bd8a096333476e49d0d558)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -36,7 +36,7 @@
     /// <summary>
     /// Class that holds all wave conditions calculation specific input parameters.
     /// </summary>
-    public class WaveConditionsInput : Observable, ICalculationInput
+    public class WaveConditionsInput : Observable, ICalculationInput, IUseBreakWater, IUseForeshore
     {
         private const double designWaterLevelSubstraction = 0.01;
 
Fisheye: Tag aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b refers to a dead (removed) revision in file `Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputBreakWaterProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -31,6 +31,7 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
@@ -63,24 +64,6 @@
         private const int foreshoreGeometryPropertyIndex = 13;
         private const int revetmentTypePropertyIndex = 14;
 
-        [PropertyOrder(hydraulicBoundaryLocationPropertyIndex)]
-        [Editor(typeof(WaveConditionsInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
-        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
-        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_DisplayName")]
-        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_Description")]
-        public virtual HydraulicBoundaryLocation HydraulicBoundaryLocation
-        {
-            get
-            {
-                return data.WrappedData.HydraulicBoundaryLocation;
-            }
-            set
-            {
-                data.WrappedData.HydraulicBoundaryLocation = value;
-                data.WrappedData.NotifyObservers();
-            }
-        }
-
         [PropertyOrder(assessmentLevelPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "AssessmentLevel_DisplayName")]
@@ -204,24 +187,6 @@
             }
         }
 
-        [PropertyOrder(foreshoreProfilePropertyIndex)]
-        [Editor(typeof(WaveConditionsInputContextForeshoreProfileEditor), typeof(UITypeEditor))]
-        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "ForeshoreProfile_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ForeshoreProfile_Description")]
-        public ForeshoreProfile ForeshoreProfile
-        {
-            get
-            {
-                return data.WrappedData.ForeshoreProfile;
-            }
-            set
-            {
-                data.WrappedData.ForeshoreProfile = value;
-                data.WrappedData.NotifyObservers();
-            }
-        }
-
         [PropertyOrder(worldReferencePointPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "WorldReferencePoint_DisplayName")]
@@ -259,14 +224,11 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_Description")]
-        public WaveConditionsInputBreakWaterProperties BreakWater
+        public UseBreakWaterProperties BreakWater
         {
             get
             {
-                return new WaveConditionsInputBreakWaterProperties
-                {
-                    Data = data.WrappedData
-                };
+                return new UseBreakWaterProperties(data.WrappedData, UseBreakWaterEnabled);
             }
         }
 
@@ -275,14 +237,11 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_Description")]
-        public virtual WaveConditionsInputForeshoreProfileProperties ForeshoreGeometry
+        public UseForeshoreProperties ForeshoreGeometry
         {
             get
             {
-                return new WaveConditionsInputForeshoreProfileProperties
-                {
-                    Data = data.WrappedData
-                };
+                return new UseForeshoreProperties(data.WrappedData);
             }
         }
 
@@ -292,6 +251,42 @@
         [ResourcesDescription(typeof(Resources), "WaveConditionsInput_RevetmentType_Description")]
         public abstract string RevetmentType { get; }
 
+        [PropertyOrder(hydraulicBoundaryLocationPropertyIndex)]
+        [Editor(typeof(WaveConditionsInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_Description")]
+        public virtual HydraulicBoundaryLocation HydraulicBoundaryLocation
+        {
+            get
+            {
+                return data.WrappedData.HydraulicBoundaryLocation;
+            }
+            set
+            {
+                data.WrappedData.HydraulicBoundaryLocation = value;
+                data.WrappedData.NotifyObservers();
+            }
+        }
+
+        [PropertyOrder(foreshoreProfilePropertyIndex)]
+        [Editor(typeof(WaveConditionsInputContextForeshoreProfileEditor), typeof(UITypeEditor))]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+        [ResourcesDisplayName(typeof(Resources), "ForeshoreProfile_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "ForeshoreProfile_Description")]
+        public ForeshoreProfile ForeshoreProfile
+        {
+            get
+            {
+                return data.WrappedData.ForeshoreProfile;
+            }
+            set
+            {
+                data.WrappedData.ForeshoreProfile = value;
+                data.WrappedData.NotifyObservers();
+            }
+        }
+
         public virtual IEnumerable<HydraulicBoundaryLocation> GetAvailableHydraulicBoundaryLocations()
         {
             return data.HydraulicBoundaryLocations;
@@ -301,5 +296,10 @@
         {
             return data.ForeshoreProfiles;
         }
+
+        private bool UseBreakWaterEnabled()
+        {
+            return data.WrappedData.ForeshoreProfile != null;
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj
===================================================================
diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj	(.../Ringtoets.Revetment.Forms.csproj)	(revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj	(.../Ringtoets.Revetment.Forms.csproj)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -45,7 +45,6 @@
     <Compile Include="PropertyClasses\GeneralWaveConditionsInputProperties.cs" />
     <Compile Include="PropertyClasses\IWaveConditionsInputContextProperties.cs" />
     <Compile Include="PropertyClasses\WaveConditionsInputContextProperties.cs" />
-    <Compile Include="PropertyClasses\WaveConditionsInputBreakWaterProperties.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -ree9ea66795cde20ae1bd8a096333476e49d0d558 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision ee9ea66795cde20ae1bd8a096333476e49d0d558)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -107,6 +107,8 @@
             // Assert
             Assert.IsInstanceOf<Observable>(input);
             Assert.IsInstanceOf<ICalculationInput>(input);
+            Assert.IsInstanceOf<IUseBreakWater>(input);
+            Assert.IsInstanceOf<IUseForeshore>(input);
             Assert.IsNull(input.HydraulicBoundaryLocation);
             Assert.IsNull(input.ForeshoreProfile);
             Assert.IsFalse(input.UseBreakWater);
Fisheye: Tag aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -33,6 +33,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
@@ -104,8 +105,8 @@
             Assert.IsNull(properties.WorldReferencePoint);
             Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
             Assert.AreEqual(0, properties.Orientation.Value);
-            Assert.AreSame(input, properties.BreakWater.Data);
-            Assert.AreSame(input, properties.ForeshoreGeometry.Data);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
+            Assert.IsInstanceOf<UseForeshoreProperties>(properties.ForeshoreGeometry);
             Assert.AreEqual("Test", properties.RevetmentType);
         }
 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj
===================================================================
diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj	(.../Ringtoets.Revetment.Forms.Test.csproj)	(revision f3e0a05168328097121cfa8f9c4ff32d775879ff)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj	(.../Ringtoets.Revetment.Forms.Test.csproj)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -58,7 +58,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\GeneralWaveConditionsInputPropertiesTest.cs" />
     <Compile Include="PropertyClasses\WaveConditionsInputContextPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveConditionsInputBreakWaterPropertiesTest.cs" />
     <Compile Include="PropertyClasses\WaveConditionsInputForeshoreProfilePropertiesTest.cs" />
     <Compile Include="PropertyClasses\WaveConditionsOutputPropertiesTest.cs" />
     <Compile Include="UITypeEditors\WaveConditionsInputContextForeshoreProfileEditorTest.cs" />
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -33,6 +33,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PropertyClasses;
@@ -112,8 +113,8 @@
             Assert.IsNull(properties.WorldReferencePoint);
             Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
             Assert.AreEqual(0, properties.Orientation.Value);
-            Assert.AreSame(input, properties.BreakWater.Data);
-            Assert.AreSame(input, properties.ForeshoreGeometry.Data);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
+            Assert.IsInstanceOf<UseForeshoreProperties>(properties.ForeshoreGeometry);
             Assert.AreEqual("Steen (blokken en zuilen)", properties.RevetmentType);
             mocks.VerifyAll();
         }
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
@@ -33,6 +33,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PropertyClasses;
@@ -112,8 +113,8 @@
             Assert.IsNull(properties.WorldReferencePoint);
             Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
             Assert.AreEqual(0, properties.Orientation.Value);
-            Assert.AreSame(input, properties.BreakWater.Data);
-            Assert.AreSame(input, properties.ForeshoreGeometry.Data);
+            Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
+            Assert.IsInstanceOf<UseForeshoreProperties>(properties.ForeshoreGeometry);
             Assert.AreEqual("Asfalt", properties.RevetmentType);
             mocks.VerifyAll();
         }