Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureReplaceDataStrategy.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -ra8f322a9cea54ebf9134fdfd3cbb933456f25146
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureReplaceDataStrategy.cs	(.../ClosingStructureReplaceDataStrategy.cs)	(revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureReplaceDataStrategy.cs	(.../ClosingStructureReplaceDataStrategy.cs)	(revision a8f322a9cea54ebf9134fdfd3cbb933456f25146)
@@ -24,6 +24,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Service;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.IO.Structures;
@@ -53,10 +54,7 @@
 
         protected override IEnumerable<IObservable> ClearData()
         {
-            return RingtoetsCommonDataSynchronizationService.RemoveAllStructures(
-                FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>(),
-                FailureMechanism.ClosingStructures,
-                FailureMechanism.SectionResults);
+            return ClosingStructuresDataSynchronizationService.RemoveAllStructures(FailureMechanism);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -ra8f322a9cea54ebf9134fdfd3cbb933456f25146
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs	(.../ClosingStructureUpdateDataStrategy.cs)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs	(.../ClosingStructureUpdateDataStrategy.cs)	(revision a8f322a9cea54ebf9134fdfd3cbb933456f25146)
@@ -24,6 +24,8 @@
 using System.Linq;
 using Core.Common.Base;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Service;
+using Ringtoets.ClosingStructures.Util;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.Forms;
@@ -55,11 +57,7 @@
 
         protected override IEnumerable<IObservable> RemoveObjectAndDependentData(ClosingStructure removedObject)
         {
-            return RingtoetsCommonDataSynchronizationService.RemoveStructure(
-                removedObject,
-                FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>(),
-                FailureMechanism.ClosingStructures,
-                FailureMechanism.SectionResults);
+            return ClosingStructuresDataSynchronizationService.RemoveStructure(removedObject, FailureMechanism);
         }
 
         #region Updating Data Functions
@@ -79,8 +77,8 @@
             affectedObjects.AddRange(GetAffectedCalculationsWithClosingStructure(structure)
                                          .Select(affectedCalculation => affectedCalculation.InputParameters));
 
-            affectedObjects.AddRange(StructuresHelper.UpdateCalculationToSectionResultAssignments(
-                                         FailureMechanism.SectionResults,
+            affectedObjects.AddRange(ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(
+                                         FailureMechanism.SectionResults2,
                                          FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>()));
 
             return affectedObjects;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs
===================================================================
diff -u -r560ea9f96409cc65f4666adf212a1c135c5e626f -ra8f322a9cea54ebf9134fdfd3cbb933456f25146
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs	(.../ClosingStructureReplaceDataStrategyTest.cs)	(revision 560ea9f96409cc65f4666adf212a1c135c5e626f)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs	(.../ClosingStructureReplaceDataStrategyTest.cs)	(revision a8f322a9cea54ebf9134fdfd3cbb933456f25146)
@@ -322,7 +322,7 @@
             {
                 location
             }));
-            StructuresFailureMechanismSectionResult<ClosingStructuresInput> sectionResult = failureMechanism.SectionResults.First();
+            ClosingStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults2.First();
             sectionResult.Calculation = calculation;
 
             failureMechanism.ClosingStructures.AddRange(new[]
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs
===================================================================
diff -u -r560ea9f96409cc65f4666adf212a1c135c5e626f -ra8f322a9cea54ebf9134fdfd3cbb933456f25146
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs	(.../ClosingStructureUpdateDataStrategyTest.cs)	(revision 560ea9f96409cc65f4666adf212a1c135c5e626f)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs	(.../ClosingStructureUpdateDataStrategyTest.cs)	(revision a8f322a9cea54ebf9134fdfd3cbb933456f25146)
@@ -28,14 +28,13 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.ClosingStructures.Plugin.FileImporters;
+using Ringtoets.ClosingStructures.Util;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.IO.Structures;
-using Ringtoets.Common.Util;
 
 namespace Ringtoets.ClosingStructures.Plugin.Test.FileImporters
 {
@@ -659,10 +658,9 @@
                 updatedMatchingPoint
             }));
 
-            StructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults,
-                                                                         failureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
+            ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults2);
 
-            StructuresFailureMechanismSectionResult<ClosingStructuresInput>[] sectionResults = failureMechanism.SectionResults.ToArray();
+            ClosingStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults2.ToArray();
 
             var strategy = new ClosingStructureUpdateDataStrategy(failureMechanism);
 
@@ -689,7 +687,7 @@
                 sectionResults[1]
             }, affectedObjects);
 
-            sectionResults = failureMechanism.SectionResults.ToArray();
+            sectionResults = failureMechanism.SectionResults2.ToArray();
             Assert.AreEqual(2, sectionResults.Length);
             Assert.IsNull(sectionResults[0].Calculation);
             Assert.AreSame(calculation, sectionResults[1].Calculation);
@@ -731,10 +729,9 @@
                 new Point2D(10, 10)
             }));
 
-            StructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults,
-                                                                         failureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
+            ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults2);
 
-            StructuresFailureMechanismSectionResult<ClosingStructuresInput>[] sectionResults = failureMechanism.SectionResults.ToArray();
+            ClosingStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults2.ToArray();
 
             var strategy = new ClosingStructureUpdateDataStrategy(failureMechanism);
 
@@ -754,7 +751,7 @@
                 sectionResults[0]
             }, affectedObjects);
 
-            sectionResults = failureMechanism.SectionResults.ToArray();
+            sectionResults = failureMechanism.SectionResults2.ToArray();
             Assert.AreEqual(1, sectionResults.Length);
             Assert.IsNull(sectionResults[0].Calculation);
         }