Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -729,8 +729,7 @@
                               context,
                               Validate,
                               EnableValidateAndCalculateMenuItemForCalculation)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<StructuresCalculationScenario<ClosingStructuresInput>, ClosingStructuresCalculationScenarioContext>(
                               context,
                               Calculate,
                               EnableValidateAndCalculateMenuItemForCalculation)
@@ -756,10 +755,10 @@
             ClosingStructuresCalculationService.Validate(context.WrappedData, context.AssessmentSection);
         }
 
-        private void Calculate(StructuresCalculation<ClosingStructuresInput> calculation, ClosingStructuresCalculationScenarioContext context)
+        private void Calculate(ClosingStructuresCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
                                                                                                                    context.FailureMechanism,
                                                                                                                    context.AssessmentSection));
         }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -1055,7 +1055,8 @@
                 var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder);
 
                 // Call
-                ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => null).Build();
+                ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformCalculationItem<TestCalculation, TestCalculationContext>(
+                    calculationContext, null, context => null).Build();
 
                 // Assert
                 Assert.IsInstanceOf<ContextMenuStrip>(result);
@@ -1102,7 +1103,8 @@
                 const string errorMessage = "No valid data";
 
                 // Call
-                ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => errorMessage).Build();
+                ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformCalculationItem<TestCalculation, TestCalculationContext>(
+                    calculationContext, null, context => errorMessage).Build();
 
                 // Assert
                 Assert.IsInstanceOf<ContextMenuStrip>(result);
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -883,8 +883,7 @@
                               context,
                               Validate,
                               EnableValidateAndCalculateMenuItemForCalculation)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<GrassCoverErosionInwardsCalculationScenario, GrassCoverErosionInwardsCalculationScenarioContext>(
                               context,
                               Calculate,
                               EnableValidateAndCalculateMenuItemForCalculation)
@@ -911,10 +910,10 @@
             GrassCoverErosionInwardsCalculationService.Validate(context.WrappedData, context.FailureMechanism, context.AssessmentSection);
         }
 
-        private void Calculate(GrassCoverErosionInwardsCalculation calculation, GrassCoverErosionInwardsCalculationScenarioContext context)
+        private void Calculate(GrassCoverErosionInwardsCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                             GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
                                                                                                                           context.FailureMechanism,
                                                                                                                           context.AssessmentSection));
         }
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -943,8 +943,7 @@
                        nodeData,
                        Validate,
                        EnableValidateAndCalculateMenuItemForCalculation)
-                   .AddPerformCalculationItem(
-                       calculation,
+                   .AddPerformCalculationItem<GrassCoverErosionOutwardsWaveConditionsCalculation, GrassCoverErosionOutwardsWaveConditionsCalculationContext>(
                        nodeData,
                        Calculate,
                        EnableValidateAndCalculateMenuItemForCalculation)
@@ -978,11 +977,10 @@
                                                           failureMechanism.GetNorm(assessmentSection, calculation.InputParameters.CategoryType));
         }
 
-        private void Calculate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
-                               GrassCoverErosionOutwardsWaveConditionsCalculationContext context)
+        private void Calculate(GrassCoverErosionOutwardsWaveConditionsCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                             GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(context.WrappedData,
                                                                                                                                          context.FailureMechanism,
                                                                                                                                          context.AssessmentSection));
         }
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -735,8 +735,7 @@
                               context,
                               Validate,
                               EnableValidateAndCalculateMenuItemForCalculation)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<StructuresCalculationScenario<HeightStructuresInput>, HeightStructuresCalculationScenarioContext>(
                               context,
                               Calculate,
                               EnableValidateAndCalculateMenuItemForCalculation)
@@ -762,11 +761,13 @@
             HeightStructuresCalculationService.Validate(context.WrappedData, context.AssessmentSection);
         }
 
-        private void Calculate(StructuresCalculation<HeightStructuresInput> calculation, HeightStructuresCalculationScenarioContext context)
+        private void Calculate(HeightStructuresCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(
                 Gui.MainWindow,
-                HeightStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, context.FailureMechanism, context.AssessmentSection));
+                HeightStructuresCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
+                                                                                     context.FailureMechanism,
+                                                                                     context.AssessmentSection));
         }
 
         private static void CalculationContextOnNodeRemoved(HeightStructuresCalculationScenarioContext context, object parentData)
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -900,7 +900,7 @@
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
-            MacroStabilityInwardsCalculation calculation = nodeData.WrappedData;
+            MacroStabilityInwardsCalculationScenario calculation = nodeData.WrappedData;
 
             return builder.AddExportItem()
                           .AddSeparator()
@@ -911,8 +911,7 @@
                           .AddValidateCalculationItem(
                               nodeData,
                               Validate)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<MacroStabilityInwardsCalculationScenario, MacroStabilityInwardsCalculationScenarioContext>(
                               nodeData,
                               Calculate)
                           .AddSeparator()
@@ -943,11 +942,12 @@
             MacroStabilityInwardsCalculationService.Validate(context.WrappedData, GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData));
         }
 
-        private void Calculate(MacroStabilityInwardsCalculation calculation, MacroStabilityInwardsCalculationScenarioContext context)
+        private void Calculate(MacroStabilityInwardsCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(
                 Gui.MainWindow,
-                MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivity(calculation, context.AssessmentSection));
+                MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
+                                                                                          context.AssessmentSection));
         }
 
         #endregion
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -125,9 +125,9 @@
             yield return new PropertyInfo<ProbabilisticPipingProfileSpecificOutputContext, ProbabilisticPipingProfileSpecificOutputProperties>
             {
                 CreateInstance = context => new ProbabilisticPipingProfileSpecificOutputProperties(context.WrappedData.Output?.ProfileSpecificOutput,
-                                                                                                          context.WrappedData,
-                                                                                                          context.FailureMechanism,
-                                                                                                          context.AssessmentSection)
+                                                                                                   context.WrappedData,
+                                                                                                   context.FailureMechanism,
+                                                                                                   context.AssessmentSection)
             };
             yield return new PropertyInfo<ProbabilisticPipingSectionSpecificOutputContext, ProbabilisticPipingSectionSpecificOutputProperties>
             {
@@ -1095,8 +1095,7 @@
                           .AddValidateCalculationItem(
                               nodeData,
                               ValidateSemiProbabilistic)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<SemiProbabilisticPipingCalculationScenario, SemiProbabilisticPipingCalculationScenarioContext>(
                               nodeData,
                               CalculateSemiProbabilistic)
                           .AddSeparator()
@@ -1122,11 +1121,10 @@
                                                                GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData));
         }
 
-        private void CalculateSemiProbabilistic(SemiProbabilisticPipingCalculationScenario calculation,
-                                                SemiProbabilisticPipingCalculationScenarioContext context)
+        private void CalculateSemiProbabilistic(SemiProbabilisticPipingCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation,
+                                             PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(context.WrappedData,
                                                                                                                                context.FailureMechanism.GeneralInput,
                                                                                                                                context.AssessmentSection));
         }
@@ -1173,8 +1171,7 @@
                           .AddValidateCalculationItem(
                               nodeData,
                               ValidateProbabilistic)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<ProbabilisticPipingCalculationScenario, ProbabilisticPipingCalculationScenarioContext>(
                               nodeData,
                               CalculateProbabilistic)
                           .AddSeparator()
@@ -1200,10 +1197,10 @@
                                                            context.AssessmentSection);
         }
 
-        private void CalculateProbabilistic(ProbabilisticPipingCalculationScenario calculation, ProbabilisticPipingCalculationScenarioContext context)
+        private void CalculateProbabilistic(ProbabilisticPipingCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             PipingCalculationActivityFactory.CreateProbabilisticPipingCalculationActivity(calculation,
+                                             PipingCalculationActivityFactory.CreateProbabilisticPipingCalculationActivity(context.WrappedData,
                                                                                                                            context.FailureMechanism,
                                                                                                                            context.AssessmentSection));
         }
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -737,8 +737,7 @@
                               context,
                               Validate,
                               EnableValidateAndCalculateMenuItemForCalculation)
-                          .AddPerformCalculationItem(
-                              calculation,
+                          .AddPerformCalculationItem<StructuresCalculationScenario<StabilityPointStructuresInput>, StabilityPointStructuresCalculationScenarioContext>(
                               context,
                               Calculate,
                               EnableValidateAndCalculateMenuItemForCalculation)
@@ -764,10 +763,10 @@
             StabilityPointStructuresCalculationService.Validate(context.WrappedData, context.AssessmentSection);
         }
 
-        private void Calculate(StructuresCalculation<StabilityPointStructuresInput> calculation, StabilityPointStructuresCalculationScenarioContext context)
+        private void Calculate(StabilityPointStructuresCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
                                                                                                                           context.FailureMechanism,
                                                                                                                           context.AssessmentSection));
         }
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -628,7 +628,8 @@
                    .AddValidateCalculationItem(nodeData,
                                                Validate,
                                                EnableValidateAndCalculateMenuItemForCalculation)
-                   .AddPerformCalculationItem(calculation, nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
+                   .AddPerformCalculationItem<StabilityStoneCoverWaveConditionsCalculation, StabilityStoneCoverWaveConditionsCalculationContext>(
+                       nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
                    .AddSeparator()
                    .AddClearCalculationOutputItem(calculation)
                    .AddDeleteItem()
@@ -657,12 +658,11 @@
                                                           assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
         }
 
-        private void Calculate(StabilityStoneCoverWaveConditionsCalculation calculation,
-                               StabilityStoneCoverWaveConditionsCalculationContext context)
+        private void Calculate(StabilityStoneCoverWaveConditionsCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
                                              StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
-                                                 calculation,
+                                                 context.WrappedData,
                                                  context.FailureMechanism,
                                                  context.AssessmentSection));
         }
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -628,7 +628,8 @@
                           .AddValidateCalculationItem(nodeData,
                                                       Validate,
                                                       EnableValidateAndCalculateMenuItemForCalculation)
-                          .AddPerformCalculationItem(calculation, nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
+                          .AddPerformCalculationItem<WaveImpactAsphaltCoverWaveConditionsCalculation, WaveImpactAsphaltCoverWaveConditionsCalculationContext>(
+                              nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
                           .AddSeparator()
                           .AddClearCalculationOutputItem(calculation)
                           .AddDeleteItem()
@@ -657,11 +658,10 @@
                                                           assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
         }
 
-        private void Calculate(WaveImpactAsphaltCoverWaveConditionsCalculation calculation,
-                               WaveImpactAsphaltCoverWaveConditionsCalculationContext context)
+        private void Calculate(WaveImpactAsphaltCoverWaveConditionsCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                             WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
                                                                                                                                       context.FailureMechanism,
                                                                                                                                       context.AssessmentSection));
         }