Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r5f489223b4d730eec42acd55533dd012d10dd1ca -rc82e195aaa6fea71270f7d98520ff314f3432d0e
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 5f489223b4d730eec42acd55533dd012d10dd1ca)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision c82e195aaa6fea71270f7d98520ff314f3432d0e)
@@ -544,15 +544,15 @@
                 if (dialog.SelectedItems.Any())
                 {
                     GenerateClosingStructuresCalculations(
-                        nodeData.FailureMechanism.SectionResults,
+                        nodeData.FailureMechanism,
                         dialog.SelectedItems.Cast<ClosingStructure>(),
                         nodeData.WrappedData.Children);
                     nodeData.NotifyObservers();
                 }
             }
         }
 
-        private static void GenerateClosingStructuresCalculations(IEnumerable<ClosingStructuresFailureMechanismSectionResult> sectionResults, IEnumerable<ClosingStructure> structures, IList<ICalculationBase> calculations)
+        private static void GenerateClosingStructuresCalculations(ClosingStructuresFailureMechanism failureMechanism, IEnumerable<ClosingStructure> structures, IList<ICalculationBase> calculations)
         {
             foreach (var structure in structures)
             {
@@ -566,7 +566,9 @@
                 };
                 calculations.Add(calculation);
             }
-            StructuresHelper.UpdateCalculationToSectionResultAssignments(sectionResults, calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
+            StructuresHelper.UpdateCalculationToSectionResultAssignments(
+                failureMechanism.SectionResults,
+                failureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
         }
 
         private static void ValidateAll(ClosingStructuresCalculationGroupContext context)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r9a0e768e9ddbc5e4917201fdb864bb2247e5cd90 -rc82e195aaa6fea71270f7d98520ff314f3432d0e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 9a0e768e9ddbc5e4917201fdb864bb2247e5cd90)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision c82e195aaa6fea71270f7d98520ff314f3432d0e)
@@ -569,15 +569,15 @@
                 if (dialog.SelectedItems.Any())
                 {
                     GenerateHeightStructuresCalculations(
-                        nodeData.FailureMechanism.SectionResults,
+                        nodeData.FailureMechanism,
                         dialog.SelectedItems.Cast<HeightStructure>(),
                         nodeData.WrappedData.Children);
                     nodeData.NotifyObservers();
                 }
             }
         }
 
-        private static void GenerateHeightStructuresCalculations(IEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults, IEnumerable<HeightStructure> structures, IList<ICalculationBase> calculations)
+        private static void GenerateHeightStructuresCalculations(HeightStructuresFailureMechanism failureMechanism, IEnumerable<HeightStructure> structures, IList<ICalculationBase> calculations)
         {
             foreach (var structure in structures)
             {
@@ -592,8 +592,8 @@
                 calculations.Add(calculation);
             }
             StructuresHelper.UpdateCalculationToSectionResultAssignments(
-                sectionResults,
-                calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
+                failureMechanism.SectionResults,
+                failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
         }
 
         private static void CalculationGroupContextOnNodeRemoved(HeightStructuresCalculationGroupContext context, object parentNodeData)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r59d8943b166f40b1d8b3595b43b2a524e719b2ef -rc82e195aaa6fea71270f7d98520ff314f3432d0e
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 59d8943b166f40b1d8b3595b43b2a524e719b2ef)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision c82e195aaa6fea71270f7d98520ff314f3432d0e)
@@ -565,15 +565,15 @@
                 if (dialog.SelectedItems.Any())
                 {
                     GenerateStabilityPointStructuresCalculations(
-                        nodeData.FailureMechanism.SectionResults,
+                        nodeData.FailureMechanism,
                         dialog.SelectedItems.Cast<StabilityPointStructure>(),
                         nodeData.WrappedData.Children);
                     nodeData.NotifyObservers();
                 }
             }
         }
 
-        private static void GenerateStabilityPointStructuresCalculations(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> sectionResults, IEnumerable<StabilityPointStructure> structures, IList<ICalculationBase> calculations)
+        private static void GenerateStabilityPointStructuresCalculations(StabilityPointStructuresFailureMechanism failureMechanism, IEnumerable<StabilityPointStructure> structures, IList<ICalculationBase> calculations)
         {
             foreach (StabilityPointStructure structure in structures)
             {
@@ -588,8 +588,8 @@
                 calculations.Add(calculation);
             }
             StructuresHelper.UpdateCalculationToSectionResultAssignments(
-                sectionResults,
-                calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>());
+                failureMechanism.SectionResults,
+                failureMechanism.Calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>());
         }
 
         private static void CalculationGroupContextOnNodeRemoved(StabilityPointStructuresCalculationGroupContext context, object parentNodeData)