Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -rf1dba8f366d531b102d705ff31afb7b061c7d43e -rab2f7996c204ca193fb728b3983b75a97c92c7b6
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision f1dba8f366d531b102d705ff31afb7b061c7d43e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision ab2f7996c204ca193fb728b3983b75a97c92c7b6)
@@ -367,18 +367,6 @@
             };
         }
 
-        private void CalculateAll(GrassCoverErosionInwardsFailureMechanism failureMechanism, IEnumerable<GrassCoverErosionInwardsCalculation> calculations, IAssessmentSection assessmentSection)
-        {
-            ActivityProgressDialogRunner.Run(
-                Gui.MainWindow,
-                calculations.Select(calc =>
-                                        new GrassCoverErosionInwardsCalculationActivity(
-                                            calc,
-                                            assessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                            failureMechanism,
-                                            assessmentSection)).ToArray());
-        }
-
         private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection)
         {
             return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
@@ -625,7 +613,9 @@
 
         private void CalculateAll(GrassCoverErosionInwardsFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<GrassCoverErosionInwardsCalculation>(), context.Parent);
+            ActivityProgressDialogRunner.Run(
+                Gui.MainWindow,
+                GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
         }
 
         #endregion
@@ -856,7 +846,11 @@
 
         private void CalculateAll(CalculationGroup group, GrassCoverErosionInwardsCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<GrassCoverErosionInwardsCalculation>(), context.AssessmentSection);
+            ActivityProgressDialogRunner.Run(
+                Gui.MainWindow,
+                GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData,
+                                                                                               context.FailureMechanism,
+                                                                                               context.AssessmentSection));
         }
 
         #endregion
@@ -927,10 +921,10 @@
 
         private void Calculate(GrassCoverErosionInwardsCalculation calculation, GrassCoverErosionInwardsCalculationContext context)
         {
-            ActivityProgressDialogRunner.Run(Gui.MainWindow, new GrassCoverErosionInwardsCalculationActivity(calculation,
-                                                                                                             context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
-                                                                                                             context.FailureMechanism,
-                                                                                                             context.AssessmentSection));
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                          context.FailureMechanism,
+                                                                                                                          context.AssessmentSection));
         }
 
         private static void CalculationContextOnNodeRemoved(GrassCoverErosionInwardsCalculationContext context, object parentData)
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs
===================================================================
diff -u -rf1dba8f366d531b102d705ff31afb7b061c7d43e -rab2f7996c204ca193fb728b3983b75a97c92c7b6
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs	(.../GrassCoverErosionInwardsCalculationActivity.cs)	(revision f1dba8f366d531b102d705ff31afb7b061c7d43e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs	(.../GrassCoverErosionInwardsCalculationActivity.cs)	(revision ab2f7996c204ca193fb728b3983b75a97c92c7b6)
@@ -30,7 +30,7 @@
     /// <summary>
     /// <see cref="CalculatableActivity"/> for running a grass cover erosion inwards calculation.
     /// </summary>
-    public class GrassCoverErosionInwardsCalculationActivity : CalculatableActivity
+    internal class GrassCoverErosionInwardsCalculationActivity : CalculatableActivity
     {
         private readonly GrassCoverErosionInwardsCalculation calculation;
         private readonly string hydraulicBoundaryDatabaseFilePath;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r9726c1ed2a69caa0792394721d1bcf6dc587f421 -rab2f7996c204ca193fb728b3983b75a97c92c7b6
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 9726c1ed2a69caa0792394721d1bcf6dc587f421)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision ab2f7996c204ca193fb728b3983b75a97c92c7b6)
@@ -51,7 +51,6 @@
     public class GrassCoverErosionInwardsCalculationActivityIntegrationTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
-        private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
         [Test]
         public void Run_InvalidHydraulicBoundaryDatabase_LogValidationStartAndEndWithError()
@@ -73,7 +72,9 @@
                 }
             };
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, "", assessmentSection.GrassCoverErosionInwards, assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
 
             // Call
             Action call = () => activity.Run();
@@ -133,8 +134,9 @@
                 }
             };
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             var progressTexts = "";
 
             activity.ProgressChanged += (s, e) => progressTexts += activity.ProgressText + Environment.NewLine;
@@ -231,8 +233,9 @@
             calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath, string.Empty)).Return(calculator);
             mockRepository.ReplayAll();
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -313,8 +316,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -359,8 +363,9 @@
             calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath, string.Empty)).Return(overtoppingCalculator);
             mockRepository.ReplayAll();
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -420,8 +425,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();
@@ -461,8 +467,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();
@@ -487,9 +494,11 @@
         public void Run_ValidDikeHeightCalculation_InputPropertiesCorrectlySendToService(
             [Values(BreakWaterType.Caisson,
                 BreakWaterType.Wall,
-                BreakWaterType.Dam)] BreakWaterType breakWaterType,
+                BreakWaterType.Dam)]
+            BreakWaterType breakWaterType,
             [Values(DikeHeightCalculationType.CalculateByAssessmentSectionNorm,
-                DikeHeightCalculationType.CalculateByProfileSpecificRequiredProbability)] DikeHeightCalculationType dikeHeightCalculationType)
+                DikeHeightCalculationType.CalculateByProfileSpecificRequiredProbability)]
+            DikeHeightCalculationType dikeHeightCalculationType)
         {
             // Setup
             var dikeHeightCalculator = new TestHydraulicLoadsCalculator();
@@ -516,8 +525,9 @@
                 }
             };
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -606,8 +616,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -664,8 +675,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -723,8 +735,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -780,8 +793,9 @@
                 }
             };
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -842,8 +856,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();
@@ -888,8 +903,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();
@@ -915,9 +931,11 @@
         public void Run_ValidOvertoppingRateCalculation_InputPropertiesCorrectlySendToService(
             [Values(BreakWaterType.Caisson,
                 BreakWaterType.Wall,
-                BreakWaterType.Dam)] BreakWaterType breakWaterType,
+                BreakWaterType.Dam)]
+            BreakWaterType breakWaterType,
             [Values(OvertoppingRateCalculationType.CalculateByAssessmentSectionNorm,
-                OvertoppingRateCalculationType.CalculateByProfileSpecificRequiredProbability)] OvertoppingRateCalculationType overtoppingRateCalculationType)
+                OvertoppingRateCalculationType.CalculateByProfileSpecificRequiredProbability)]
+            OvertoppingRateCalculationType overtoppingRateCalculationType)
         {
             // Setup
             var overtoppingRateCalculator = new TestHydraulicLoadsCalculator();
@@ -944,8 +962,9 @@
                 }
             };
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -1033,8 +1052,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -1091,8 +1111,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -1150,8 +1171,9 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+                CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                             assessmentSection.GrassCoverErosionInwards,
+                                                                                                                             assessmentSection);
                 // Call
                 Action call = () => activity.Run();
 
@@ -1207,8 +1229,9 @@
                 }
             };
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -1269,8 +1292,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();
@@ -1315,8 +1339,9 @@
 
             calculation.Attach(observer);
 
-            var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFilePath, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
+            CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                                                                                                         assessmentSection.GrassCoverErosionInwards,
+                                                                                                                         assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();