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());
                 });