Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs
===================================================================
diff -u -r73597729ce18d3ee00d8036bca8341e9c12f2953 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs	(.../ClosingStructuresDataSynchronizationService.cs)	(revision 73597729ce18d3ee00d8036bca8341e9c12f2953)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs	(.../ClosingStructuresDataSynchronizationService.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using System.Linq;
 using Core.Common.Utils.Extensions;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.ClosingStructures.Service
@@ -43,15 +44,15 @@
         /// clearing the output.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<ClosingStructuresCalculation> ClearAllCalculationOutput(ClosingStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<ClosingStructuresInput>> ClearAllCalculationOutput(ClosingStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
             var affectedItems = failureMechanism.Calculations
-                                                .Cast<ClosingStructuresCalculation>()
+                                                .Cast<StructuresCalculation<ClosingStructuresInput>>()
                                                 .Where(c => c.HasOutput)
                                                 .ToArray();
 
@@ -61,13 +62,13 @@
         }
 
         /// <summary>
-        /// Clears the output of the given <see cref="ClosingStructuresCalculation"/>.
+        /// Clears the output of the given <see cref="StructuresCalculation{T}"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/> to clear
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> to clear
         /// the output for.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/>
         /// is <c>null</c>.</exception>
-        public static void ClearCalculationOutput(ClosingStructuresCalculation calculation)
+        public static void ClearCalculationOutput(StructuresCalculation<ClosingStructuresInput> calculation)
         {
             if (calculation == null)
             {
@@ -79,23 +80,23 @@
 
         /// <summary>
         /// Clears the <see cref="HydraulicBoundaryLocation"/> for all the calculations in
-        /// the <see cref="ClosingStructuresCalculation"/>.
+        /// the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
         /// <param name="failureMechanism">The <see cref="ClosingStructuresFailureMechanism"/>
         /// which contains the calculations.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by
         /// removing <see cref="HydraulicBoundaryLocation"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<ClosingStructuresCalculation> ClearHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<ClosingStructuresInput>> ClearHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
             var affectedItems = failureMechanism.Calculations
-                                                .Cast<ClosingStructuresCalculation>()
+                                                .Cast<StructuresCalculation<ClosingStructuresInput>>()
                                                 .Where(c => c.InputParameters.HydraulicBoundaryLocation != null)
                                                 .ToArray();
 
@@ -106,24 +107,24 @@
 
         /// <summary>
         /// Clears the <see cref="HydraulicBoundaryLocation"/> and output for all the calculations
-        /// in the <see cref="ClosingStructuresCalculation"/>.
+        /// in the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
-        /// <param name="failureMechanism">The <see cref="ClosingStructuresCalculation"/>
+        /// <param name="failureMechanism">The <see cref="StructuresCalculation{T}"/>
         /// which contains the calculations.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by
         /// removing data.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<ClosingStructuresCalculation> ClearAllCalculationOutputAndHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<ClosingStructuresInput>> ClearAllCalculationOutputAndHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
-            Collection<ClosingStructuresCalculation> affectedItems = new Collection<ClosingStructuresCalculation>();
+            Collection<StructuresCalculation<ClosingStructuresInput>> affectedItems = new Collection<StructuresCalculation<ClosingStructuresInput>>();
 
-            foreach (var calculation in failureMechanism.Calculations.Cast<ClosingStructuresCalculation>())
+            foreach (var calculation in failureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 var calculationChanged = false;
 
@@ -148,7 +149,7 @@
             return affectedItems;
         }
 
-        private static void ClearHydraulicBoundaryLocation(ClosingStructuresCalculation calculation)
+        private static void ClearHydraulicBoundaryLocation(StructuresCalculation<ClosingStructuresInput> calculation)
         {
             calculation.InputParameters.HydraulicBoundaryLocation = null;
         }