Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs
===================================================================
diff -u -rf7a04cbe5e015450af38a8983a4c57c5022722f2 -r5724d9646d808c712d3bd87ecc89d8e23426c83f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs	(.../ClosingStructuresInputContextProperties.cs)	(revision f7a04cbe5e015450af38a8983a4c57c5022722f2)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs	(.../ClosingStructuresInputContextProperties.cs)	(revision 5724d9646d808c712d3bd87ecc89d8e23426c83f)
@@ -56,31 +56,25 @@
         /// <summary>
         /// Creates a new instance of the <see cref="ClosingStructuresInputContextProperties"/> class.
         /// </summary>
-        public ClosingStructuresInputContextProperties()
-            : base(new ConstructionProperties
-            {
-                StructurePropertyIndex = structurePropertyIndex,
-                StructureLocationPropertyIndex = structureLocationPropertyIndex,
-                StructureNormalOrientationPropertyIndex = structureNormalOrientationPropertyIndex,
-                FlowWidthAtBottomProtectionPropertyIndex = flowWidthAtBottomProtectionPropertyIndex,
-                WidthFlowAperturesPropertyIndex = widthFlowAperturesPropertyIndex,
-                StorageStructureAreaPropertyIndex = storageStructureAreaPropertyIndex,
-                AllowedLevelIncreaseStoragePropertyIndex = allowedLevelIncreaseStoragePropertyIndex,
-                CriticalOvertoppingDischargePropertyIndex = criticalOvertoppingDischargePropertyIndex,
-                FailureProbabilityStructureWithErosionPropertyIndex = failureProbabilityStructureWithErosionPropertyIndex,
-                ForeshoreProfilePropertyIndex = foreshoreProfilePropertyIndex,
-                UseBreakWaterPropertyIndex = useBreakWaterPropertyIndex,
-                UseForeshorePropertyIndex = useForeshorePropertyIndex,
-                ModelFactorSuperCriticalFlowPropertyIndex = modelFactorSuperCriticalFlowPropertyIndex,
-                HydraulicBoundaryLocationPropertyIndex = hydraulicBoundaryLocationPropertyIndex,
-                StormDurationPropertyIndex = stormDurationPropertyIndex
-            }) { }
+        public ClosingStructuresInputContextProperties() : base(new ConstructionProperties
+        {
+            StructurePropertyIndex = structurePropertyIndex,
+            StructureLocationPropertyIndex = structureLocationPropertyIndex,
+            StructureNormalOrientationPropertyIndex = structureNormalOrientationPropertyIndex,
+            FlowWidthAtBottomProtectionPropertyIndex = flowWidthAtBottomProtectionPropertyIndex,
+            WidthFlowAperturesPropertyIndex = widthFlowAperturesPropertyIndex,
+            StorageStructureAreaPropertyIndex = storageStructureAreaPropertyIndex,
+            AllowedLevelIncreaseStoragePropertyIndex = allowedLevelIncreaseStoragePropertyIndex,
+            CriticalOvertoppingDischargePropertyIndex = criticalOvertoppingDischargePropertyIndex,
+            FailureProbabilityStructureWithErosionPropertyIndex = failureProbabilityStructureWithErosionPropertyIndex,
+            ForeshoreProfilePropertyIndex = foreshoreProfilePropertyIndex,
+            UseBreakWaterPropertyIndex = useBreakWaterPropertyIndex,
+            UseForeshorePropertyIndex = useForeshorePropertyIndex,
+            ModelFactorSuperCriticalFlowPropertyIndex = modelFactorSuperCriticalFlowPropertyIndex,
+            HydraulicBoundaryLocationPropertyIndex = hydraulicBoundaryLocationPropertyIndex,
+            StormDurationPropertyIndex = stormDurationPropertyIndex
+        }) {}
 
-        #region Schematization
-
-
-        #endregion
-
         #region Hydraulic data
 
         [PropertyOrder(deviationWaveDirectionPropertyIndex)]
@@ -112,9 +106,10 @@
             return data.FailureMechanism.ClosingStructures;
         }
 
-        protected override void AfterSettingStructure()
-        {
+        protected override void AfterSettingStructure() {}
 
-        }
+        #region Schematization
+
+        #endregion
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r2190156241cd307f0d9d784f2ff50ed339c3beac -r5724d9646d808c712d3bd87ecc89d8e23426c83f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 2190156241cd307f0d9d784f2ff50ed339c3beac)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 5724d9646d808c712d3bd87ecc89d8e23426c83f)
@@ -57,11 +57,12 @@
     {
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
-            yield return new PropertyInfo<ClosingStructure, ClosingStructureProperties>();
             yield return new PropertyInfo<ClosingStructuresFailureMechanismContext, ClosingStructureFailureMechanismProperties>
             {
                 GetObjectPropertiesData = context => context.WrappedData
             };
+            yield return new PropertyInfo<ClosingStructure, ClosingStructureProperties>();
+            yield return new PropertyInfo<ClosingStructuresInputContext, ClosingStructuresInputContextProperties>();
         }
 
         public override IEnumerable<ViewInfo> GetViewInfos()
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs
===================================================================
diff -u -r2190156241cd307f0d9d784f2ff50ed339c3beac -r5724d9646d808c712d3bd87ecc89d8e23426c83f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision 2190156241cd307f0d9d784f2ff50ed339c3beac)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision 5724d9646d808c712d3bd87ecc89d8e23426c83f)
@@ -63,14 +63,7 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // assert
-                Assert.AreEqual(2, propertyInfos.Length);
-                PropertyInfo closingStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
-                    propertyInfos,
-                    typeof(ClosingStructure),
-                    typeof(ClosingStructureProperties));
-                Assert.IsNull(closingStructurePropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(closingStructurePropertyInfo.GetObjectPropertiesData);
-                Assert.IsNull(closingStructurePropertyInfo.AfterCreate);
+                Assert.AreEqual(3, propertyInfos.Length);
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection);
@@ -81,6 +74,22 @@
                 Assert.AreSame(failureMechanism, closingStructuresFailureMechanismContextPropertyInfo.GetObjectPropertiesData(failureMechanismContext));
                 Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AdditionalDataCheck);
                 Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AfterCreate);
+
+                PropertyInfo closingStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ClosingStructure),
+                    typeof(ClosingStructureProperties));
+                Assert.IsNull(closingStructurePropertyInfo.AdditionalDataCheck);
+                Assert.IsNull(closingStructurePropertyInfo.GetObjectPropertiesData);
+                Assert.IsNull(closingStructurePropertyInfo.AfterCreate);
+
+                PropertyInfo closingStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ClosingStructuresInputContext),
+                    typeof(ClosingStructuresInputContextProperties));
+                Assert.IsNull(closingStructuresInputContextPropertyInfo.AdditionalDataCheck);
+                Assert.IsNull(closingStructuresInputContextPropertyInfo.GetObjectPropertiesData);
+                Assert.IsNull(closingStructuresInputContextPropertyInfo.AfterCreate);
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -r5724d9646d808c712d3bd87ecc89d8e23426c83f
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 0764f95727a4586e2b566d1e66c989a6327f3e2b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 5724d9646d808c712d3bd87ecc89d8e23426c83f)
@@ -65,8 +65,8 @@
             {
                 GetObjectPropertiesData = context => context.WrappedData
             };
-            yield return new PropertyInfo<HeightStructuresInputContext, HeightStructuresInputContextProperties>();
             yield return new PropertyInfo<HeightStructure, HeightStructureProperties>();
+            yield return new PropertyInfo<HeightStructuresInputContext, HeightStructuresInputContextProperties>();
         }
 
         public override IEnumerable<ImportInfo> GetImportInfos()
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r5724d9646d808c712d3bd87ecc89d8e23426c83f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 5724d9646d808c712d3bd87ecc89d8e23426c83f)
@@ -76,21 +76,21 @@
                 Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AdditionalDataCheck);
                 Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AfterCreate);
 
-                PropertyInfo heightStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
-                    propertyInfos,
-                    typeof(HeightStructuresInputContext),
-                    typeof(HeightStructuresInputContextProperties));
-                Assert.IsNull(heightStructuresInputContextPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(heightStructuresInputContextPropertyInfo.GetObjectPropertiesData);
-                Assert.IsNull(heightStructuresInputContextPropertyInfo.AfterCreate);
-
                 PropertyInfo heightStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HeightStructure),
                     typeof(HeightStructureProperties));
                 Assert.IsNull(heightStructurePropertyInfo.AdditionalDataCheck);
                 Assert.IsNull(heightStructurePropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(heightStructurePropertyInfo.AfterCreate);
+
+                PropertyInfo heightStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(HeightStructuresInputContext),
+                    typeof(HeightStructuresInputContextProperties));
+                Assert.IsNull(heightStructuresInputContextPropertyInfo.AdditionalDataCheck);
+                Assert.IsNull(heightStructuresInputContextPropertyInfo.GetObjectPropertiesData);
+                Assert.IsNull(heightStructuresInputContextPropertyInfo.AfterCreate);
             }
             mocks.VerifyAll();
         }