Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r26bd14a3e6900dd265bdea580e9c6f342593d9ef -rd9c430e627971c179b06df7113a2e8af16f0ffd7
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 26bd14a3e6900dd265bdea580e9c6f342593d9ef)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision d9c430e627971c179b06df7113a2e8af16f0ffd7)
@@ -549,23 +549,11 @@
 
         private void CalculateAll(CalculationGroup group, WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context)
         {
-            WaveImpactAsphaltCoverWaveConditionsCalculation[] calculations = group.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>().ToArray();
-
-            CalculateAll(calculations, context.FailureMechanism, context.AssessmentSection);
-        }
-
-        private void CalculateAll(WaveImpactAsphaltCoverWaveConditionsCalculation[] calculations,
-                                  WaveImpactAsphaltCoverFailureMechanism failureMechanism,
-                                  IAssessmentSection assessmentSection)
-        {
             ActivityProgressDialogRunner.Run(
                 Gui.MainWindow,
-                calculations
-                    .Select(calculation => new WaveImpactAsphaltCoverWaveConditionsCalculationActivity(calculation,
-                                                                                                       assessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                                       failureMechanism,
-                                                                                                       assessmentSection))
-                    .ToList());
+                WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(group,
+                                                                                                           context.FailureMechanism,
+                                                                                                           context.AssessmentSection));
         }
 
         private static void WaveConditionsCalculationGroupContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData)
@@ -655,10 +643,9 @@
                                         WaveImpactAsphaltCoverWaveConditionsCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             new WaveImpactAsphaltCoverWaveConditionsCalculationActivity(calculation,
-                                                                                                         context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                                         context.FailureMechanism,
-                                                                                                         context.AssessmentSection));
+                                             WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                                      context.FailureMechanism,
+                                                                                                                                      context.AssessmentSection));
         }
 
         private static void WaveConditionsCalculationContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationContext nodeData, object parentNodeData)