Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -reed032446ab1989c38508b8451818866e8dc7ad5 -r1e2a095affbb24361723e68107d3bf494276d6a2
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision eed032446ab1989c38508b8451818866e8dc7ad5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 1e2a095affbb24361723e68107d3bf494276d6a2)
@@ -342,19 +342,6 @@
             }
         }
 
-        private void CalculateAll(StabilityPointStructuresFailureMechanism failureMechanism,
-                                  IEnumerable<StructuresCalculation<StabilityPointStructuresInput>> calculations,
-                                  IAssessmentSection assessmentSection)
-        {
-            ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             calculations.Select(calc => new StabilityPointStructuresCalculationActivity(
-                                                                     calc,
-                                                                     assessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                     failureMechanism,
-                                                                     assessmentSection))
-                                                         .ToArray());
-        }
-
         #endregion
 
         #region TreeNodeInfo
@@ -473,7 +460,8 @@
 
         private void CalculateAll(StabilityPointStructuresFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<StructuresCalculation<StabilityPointStructuresInput>>(), context.Parent);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
         }
 
         #endregion
@@ -711,7 +699,10 @@
 
         private void CalculateAll(CalculationGroup group, StabilityPointStructuresCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<StructuresCalculation<StabilityPointStructuresInput>>(), context.AssessmentSection);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivities(group,
+                                                                                                                            context.FailureMechanism,
+                                                                                                                            context.AssessmentSection));
         }
 
         #endregion
@@ -779,10 +770,9 @@
         private void Calculate(StructuresCalculation<StabilityPointStructuresInput> calculation, StabilityPointStructuresCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             new StabilityPointStructuresCalculationActivity(calculation,
-                                                                                             context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                             context.FailureMechanism,
-                                                                                             context.AssessmentSection));
+                                             StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                          context.FailureMechanism,
+                                                                                                                          context.AssessmentSection));
         }
 
         private static void Validate(StabilityPointStructuresCalculationContext context)