Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rfb3cd6ea3148ac270b92a764bf7a0965785ddb1c -re5d8b58dcb5fcf82338b0511f3e9dc4d78633fda
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision fb3cd6ea3148ac270b92a764bf7a0965785ddb1c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision e5d8b58dcb5fcf82338b0511f3e9dc4d78633fda)
@@ -327,7 +327,7 @@
             yield return new PropertyInfo<DesignWaterLevelLocationsContext, DesignWaterLevelLocationsProperties>
             {
                 CreateInstance = context => new DesignWaterLevelLocationsProperties(context.WrappedData,
-                                                                                    hbl => hbl.DesignWaterLevelCalculation1)
+                                                                                    context.GetCalculationFunc)
             };
             yield return new PropertyInfo<DesignWaterLevelLocationContext, DesignWaterLevelLocationProperties>
             {
@@ -336,7 +336,7 @@
             yield return new PropertyInfo<WaveHeightLocationsContext, WaveHeightLocationsProperties>
             {
                 CreateInstance = context => new WaveHeightLocationsProperties(context.WrappedData,
-                                                                              hbl => hbl.WaveHeightCalculation1)
+                                                                              context.GetCalculationFunc)
             };
             yield return new PropertyInfo<WaveHeightLocationContext, WaveHeightLocationProperties>
             {
@@ -401,7 +401,7 @@
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CloseForData = CloseHydraulicBoundaryLocationsViewForData,
                 CreateInstance = context => new DesignWaterLevelLocationsView(context.WrappedData,
-                                                                              hbl => hbl.DesignWaterLevelCalculation1,
+                                                                              context.GetCalculationFunc,
                                                                               context.AssessmentSection,
                                                                               () => context.AssessmentSection.FailureMechanismContribution.Norm),
                 AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
@@ -414,7 +414,7 @@
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CloseForData = CloseHydraulicBoundaryLocationsViewForData,
                 CreateInstance = context => new WaveHeightLocationsView(context.WrappedData,
-                                                                        hbl => hbl.WaveHeightCalculation1,
+                                                                        context.GetCalculationFunc,
                                                                         context.AssessmentSection,
                                                                         () => context.AssessmentSection.FailureMechanismContribution.Norm),
                 AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
@@ -1701,7 +1701,7 @@
                     hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(assessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                                                               assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
                                                                                               assessmentSection.HydraulicBoundaryDatabase.Locations,
-                                                                                              hbl => hbl.DesignWaterLevelCalculation1,
+                                                                                              nodeData.GetCalculationFunc,
                                                                                               assessmentSection.FailureMechanismContribution.Norm,
                                                                                               new DesignWaterLevelCalculationMessageProvider());
                 });
@@ -1734,7 +1734,7 @@
                     hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(assessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                                                         assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
                                                                                         assessmentSection.HydraulicBoundaryDatabase.Locations,
-                                                                                        hbl => hbl.WaveHeightCalculation1,
+                                                                                        nodeData.GetCalculationFunc,
                                                                                         assessmentSection.FailureMechanismContribution.Norm,
                                                                                         new WaveHeightCalculationMessageProvider());
                 });
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r44d4c114a254db9859fbf71812e599c468dcbe77 -re5d8b58dcb5fcf82338b0511f3e9dc4d78633fda
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 44d4c114a254db9859fbf71812e599c468dcbe77)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision e5d8b58dcb5fcf82338b0511f3e9dc4d78633fda)
@@ -515,9 +515,10 @@
                 }
             };
 
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
             var context = new DesignWaterLevelLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                                assessmentSection,
-                                                               hbl => new HydraulicBoundaryLocationCalculation());
+                                                               hbl => hydraulicBoundaryLocationCalculation);
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -568,7 +569,7 @@
                             Assert.AreEqual($"Toetspeil berekenen voor locatie '{location.Name}' is gelukt.", msgs[7]);
                         });
 
-                        HydraulicBoundaryLocationOutput output = location.DesignWaterLevelCalculation1.Output;
+                        HydraulicBoundaryLocationOutput output = hydraulicBoundaryLocationCalculation.Output;
                         Assert.AreEqual(0, output.Result, output.Result.GetAccuracy());
                         Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, output.CalculationConvergence);
                     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r44d4c114a254db9859fbf71812e599c468dcbe77 -re5d8b58dcb5fcf82338b0511f3e9dc4d78633fda
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 44d4c114a254db9859fbf71812e599c468dcbe77)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision e5d8b58dcb5fcf82338b0511f3e9dc4d78633fda)
@@ -518,9 +518,10 @@
                 Id = string.Empty
             };
 
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
             var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                          assessmentSection,
-                                                         hbl => new HydraulicBoundaryLocationCalculation());
+                                                         hbl => hydraulicBoundaryLocationCalculation);
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -570,7 +571,7 @@
                             CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
                             Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' is gelukt.", msgs[7]);
                         });
-                        Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, location.WaveHeightCalculation1.Output.CalculationConvergence);
+                        Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocationCalculation.Output.CalculationConvergence);
                     }
                 }
             }