Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r9787ccfe9d4b4d04798412da22d05fb34eee4f95 -r4c9281162ddc3a03e3e658addfad69f4b8f9762f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 9787ccfe9d4b4d04798412da22d05fb34eee4f95)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 4c9281162ddc3a03e3e658addfad69f4b8f9762f)
@@ -266,17 +266,6 @@
             return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
         }
 
-        private void CalculateAll(ClosingStructuresFailureMechanism failureMechanism,
-                                  IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations,
-                                  IAssessmentSection assessmentSection)
-        {
-            ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             calculations.Select(calc => new ClosingStructuresCalculationActivity(calc,
-                                                                                                                  assessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                                                  failureMechanism,
-                                                                                                                  assessmentSection)).ToArray());
-        }
-
         #region ViewInfo
 
         #region ClosingStructuresFailureMechanismView ViewInfo
@@ -385,7 +374,7 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N), 
+                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
@@ -462,7 +451,8 @@
 
         private void CalculateAll(ClosingStructuresFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<StructuresCalculation<ClosingStructuresInput>>(), context.Parent);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
         }
 
         #endregion
@@ -674,7 +664,10 @@
 
         private void CalculateAll(CalculationGroup group, ClosingStructuresCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>(), context.AssessmentSection);
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData,
+                                                                                                                     context.FailureMechanism,
+                                                                                                                     context.AssessmentSection));
         }
 
         private static void AddCalculation(ClosingStructuresCalculationGroupContext context)
@@ -759,10 +752,9 @@
         private void Calculate(StructuresCalculation<ClosingStructuresInput> calculation, ClosingStructuresCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             new ClosingStructuresCalculationActivity(calculation,
-                                                                                      context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                      context.FailureMechanism,
-                                                                                      context.AssessmentSection));
+                                             ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                   context.FailureMechanism,
+                                                                                                                   context.AssessmentSection));
         }
 
         private static void ValidateAll(ClosingStructuresCalculationContext context)