Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationExporter.cs
===================================================================
diff -u -r00885a2dadc5abdffe264689522750425dc4bec5 -rfda98a156573b7230c33273546ac175b95c04d92
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationExporter.cs	(.../MacroStabilityInwardsCalculationExporter.cs)	(revision 00885a2dadc5abdffe264689522750425dc4bec5)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationExporter.cs	(.../MacroStabilityInwardsCalculationExporter.cs)	(revision fda98a156573b7230c33273546ac175b95c04d92)
@@ -63,7 +63,8 @@
         /// <param name="getNormativeAssessmentLevelFunc"><see cref="Func{TResult}"/>
         /// for obtaining the normative assessment level.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/>,
-        /// <paramref name="persistenceFactory"/> or <paramref name="getNormativeAssessmentLevelFunc"/> is <c>null</c>.</exception>
+        /// <paramref name="generalInput"/>, <paramref name="persistenceFactory"/> or
+        /// <paramref name="getNormativeAssessmentLevelFunc"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="filePath"/> is invalid.</exception>
         /// <remarks>A valid path:
         /// <list type="bullet">
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationGroupExporter.cs
===================================================================
diff -u -r00885a2dadc5abdffe264689522750425dc4bec5 -rfda98a156573b7230c33273546ac175b95c04d92
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationGroupExporter.cs	(.../MacroStabilityInwardsCalculationGroupExporter.cs)	(revision 00885a2dadc5abdffe264689522750425dc4bec5)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationGroupExporter.cs	(.../MacroStabilityInwardsCalculationGroupExporter.cs)	(revision fda98a156573b7230c33273546ac175b95c04d92)
@@ -61,16 +61,17 @@
         /// <param name="fileExtension">The extension of the files.</param>
         /// <param name="getNormativeAssessmentLevelFunc"><see cref="Func{T1,TResult}"/>
         /// for obtaining the normative assessment level.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculationGroup"/>, <paramref name="persistenceFactory"/>
-        /// or <paramref name="getNormativeAssessmentLevelFunc"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculationGroup"/>, <paramref name="generalInput"/>,
+        /// <paramref name="persistenceFactory"/>, or <paramref name="getNormativeAssessmentLevelFunc"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="folderPath"/> is invalid.</exception>
         /// <remarks>A valid path:<list type="bullet">
         /// <item>is not empty or <c>null</c>,</item>
         /// <item>does not consist out of only whitespace characters,</item>
         /// <item>does not contain an invalid character,</item>
         /// <item>is not too long.</item>
         /// </list></remarks>
-        public MacroStabilityInwardsCalculationGroupExporter(CalculationGroup calculationGroup, GeneralMacroStabilityInwardsInput generalInput, IPersistenceFactory persistenceFactory, string folderPath,
+        public MacroStabilityInwardsCalculationGroupExporter(CalculationGroup calculationGroup, GeneralMacroStabilityInwardsInput generalInput,
+                                                             IPersistenceFactory persistenceFactory, string folderPath,
                                                              string fileExtension, Func<MacroStabilityInwardsCalculation, RoundedDouble> getNormativeAssessmentLevelFunc)
         {
             if (calculationGroup == null)
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableDataModelFactory.cs
===================================================================
diff -u -r00885a2dadc5abdffe264689522750425dc4bec5 -rfda98a156573b7230c33273546ac175b95c04d92
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableDataModelFactory.cs	(.../PersistableDataModelFactory.cs)	(revision 00885a2dadc5abdffe264689522750425dc4bec5)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableDataModelFactory.cs	(.../PersistableDataModelFactory.cs)	(revision fda98a156573b7230c33273546ac175b95c04d92)
@@ -41,8 +41,8 @@
         /// for obtaining the normative assessment level.</param>
         /// <param name="filePath">The filePath that is used.</param>
         /// <returns>A created <see cref="PersistableDataModel"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/>
-        /// or <paramref name="getNormativeAssessmentLevelFunc"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/>, 
+        /// <paramref name="generalInput"/> or <paramref name="getNormativeAssessmentLevelFunc"/> is <c>null</c>.</exception>
         /// <exception cref="InvalidOperationException">Thrown when <paramref name="calculation"/>
         /// has no output.</exception>
         public static PersistableDataModel Create(MacroStabilityInwardsCalculation calculation,
@@ -84,9 +84,7 @@
                 Geometry = PersistableGeometryFactory.Create(soilProfile, idFactory, registry),
                 SoilLayers = PersistableSoilLayerCollectionFactory.Create(soilProfile, idFactory, registry),
                 Waternets = PersistableWaternetFactory.Create(
-                    DerivedMacroStabilityInwardsInput.GetWaternetDaily(input, generalInput),
-                    DerivedMacroStabilityInwardsInput.GetWaternetExtreme(input, generalInput, GetEffectiveAssessmentLevel(input, getNormativeAssessmentLevelFunc)),
-                    idFactory, registry, generalInput),
+                    DerivedMacroStabilityInwardsInput.GetWaternetDaily(input, generalInput), DerivedMacroStabilityInwardsInput.GetWaternetExtreme(input, generalInput, GetEffectiveAssessmentLevel(input, getNormativeAssessmentLevelFunc)), generalInput, idFactory, registry),
                 WaternetCreatorSettings = PersistableWaternetCreatorSettingsFactory.Create(input, GetEffectiveAssessmentLevel(input, getNormativeAssessmentLevelFunc), idFactory, registry),
                 States = PersistableStateFactory.Create(soilProfile, idFactory, registry),
                 Stages = PersistableStageFactory.Create(idFactory, registry)
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetFactory.cs
===================================================================
diff -u -r00885a2dadc5abdffe264689522750425dc4bec5 -rfda98a156573b7230c33273546ac175b95c04d92
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetFactory.cs	(.../PersistableWaternetFactory.cs)	(revision 00885a2dadc5abdffe264689522750425dc4bec5)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetFactory.cs	(.../PersistableWaternetFactory.cs)	(revision fda98a156573b7230c33273546ac175b95c04d92)
@@ -40,15 +40,16 @@
         /// </summary>
         /// <param name="dailyWaternet">The daily Waternet to use.</param>
         /// <param name="extremeWaternet">The extreme Waternet to use.</param>
+        /// <param name="generalInput">General calculation parameters that are the same across all calculations.</param>
         /// <param name="idFactory">The factory for creating IDs.</param>
         /// <param name="registry">The persistence registry.</param>
-        /// <param name="generalInput">General calculation parameters that are the same across all calculations.</param>
         /// <returns>A collection of <see cref="PersistableWaternet"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public static IEnumerable<PersistableWaternet> Create(MacroStabilityInwardsWaternet dailyWaternet,
                                                               MacroStabilityInwardsWaternet extremeWaternet,
-                                                              IdFactory idFactory, MacroStabilityInwardsExportRegistry registry,
-                                                              GeneralMacroStabilityInwardsInput generalInput)
+                                                              GeneralMacroStabilityInwardsInput generalInput,
+                                                              IdFactory idFactory,
+                                                              MacroStabilityInwardsExportRegistry registry)
         {
             if (dailyWaternet == null)
             {
@@ -79,13 +80,13 @@
 
             return new[]
             {
-                Create(dailyWaternet, MacroStabilityInwardsExportStageType.Daily, idFactory, registry, generalInput),
-                Create(extremeWaternet, MacroStabilityInwardsExportStageType.Extreme, idFactory, registry, generalInput)
+                Create(dailyWaternet, generalInput, MacroStabilityInwardsExportStageType.Daily, idFactory, registry),
+                Create(extremeWaternet, generalInput, MacroStabilityInwardsExportStageType.Extreme, idFactory, registry)
             };
         }
 
-        private static PersistableWaternet Create(MacroStabilityInwardsWaternet waternet, MacroStabilityInwardsExportStageType stageType,
-                                                  IdFactory idFactory, MacroStabilityInwardsExportRegistry registry, GeneralMacroStabilityInwardsInput generalInput)
+        private static PersistableWaternet Create(MacroStabilityInwardsWaternet waternet, GeneralMacroStabilityInwardsInput generalInput, MacroStabilityInwardsExportStageType stageType,
+                                                  IdFactory idFactory, MacroStabilityInwardsExportRegistry registry)
         {
             var persistableWaternet = new PersistableWaternet
             {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs
===================================================================
diff -u -rf1c7d69fc0ab74d230abeb3b10f85fb0f5e96849 -rfda98a156573b7230c33273546ac175b95c04d92
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs)	(revision f1c7d69fc0ab74d230abeb3b10f85fb0f5e96849)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs)	(revision fda98a156573b7230c33273546ac175b95c04d92)
@@ -52,7 +52,7 @@
         }
         
         [Test]
-        public void Constructor_generalInputNull_ThrowsArgumentNullException()
+        public void Constructor_GeneralInputNull_ThrowsArgumentNullException()
         {
             // Setup
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableWaternetFactoryTest.cs
===================================================================
diff -u -r8a8f7b19b0cc6931cedf5ccffed864be2305aa5a -rfda98a156573b7230c33273546ac175b95c04d92
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableWaternetFactoryTest.cs	(.../PersistableWaternetFactoryTest.cs)	(revision 8a8f7b19b0cc6931cedf5ccffed864be2305aa5a)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableWaternetFactoryTest.cs	(.../PersistableWaternetFactoryTest.cs)	(revision fda98a156573b7230c33273546ac175b95c04d92)
@@ -39,8 +39,7 @@
         public void Create_DailyWaternetNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => PersistableWaternetFactory.Create(null, new MacroStabilityInwardsWaternet(new MacroStabilityInwardsPhreaticLine[0], new MacroStabilityInwardsWaternetLine[0]),
-                                                             new IdFactory(), new MacroStabilityInwardsExportRegistry(), new GeneralMacroStabilityInwardsInput());
+            void Call() => PersistableWaternetFactory.Create(null, new MacroStabilityInwardsWaternet(new MacroStabilityInwardsPhreaticLine[0], new MacroStabilityInwardsWaternetLine[0]), new GeneralMacroStabilityInwardsInput(), new IdFactory(), new MacroStabilityInwardsExportRegistry());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -52,7 +51,7 @@
         {
             // Call
             void Call() => PersistableWaternetFactory.Create(new MacroStabilityInwardsWaternet(new MacroStabilityInwardsPhreaticLine[0], new MacroStabilityInwardsWaternetLine[0]),
-                                                             null, new IdFactory(), new MacroStabilityInwardsExportRegistry(), new GeneralMacroStabilityInwardsInput());
+                                                             null, new GeneralMacroStabilityInwardsInput(), new IdFactory(), new MacroStabilityInwardsExportRegistry());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -66,7 +65,7 @@
             var waternet = new MacroStabilityInwardsWaternet(new MacroStabilityInwardsPhreaticLine[0], new MacroStabilityInwardsWaternetLine[0]);
 
             // Call
-            void Call() => PersistableWaternetFactory.Create(waternet, waternet, null, new MacroStabilityInwardsExportRegistry(), new GeneralMacroStabilityInwardsInput());
+            void Call() => PersistableWaternetFactory.Create(waternet, waternet, new GeneralMacroStabilityInwardsInput(), null, new MacroStabilityInwardsExportRegistry());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -80,7 +79,7 @@
             var waternet = new MacroStabilityInwardsWaternet(new MacroStabilityInwardsPhreaticLine[0], new MacroStabilityInwardsWaternetLine[0]);
 
             // Call
-            void Call() => PersistableWaternetFactory.Create(waternet, waternet, new IdFactory(), null, new GeneralMacroStabilityInwardsInput());
+            void Call() => PersistableWaternetFactory.Create(waternet, waternet, new GeneralMacroStabilityInwardsInput(), new IdFactory(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -94,7 +93,7 @@
             var waternet = new MacroStabilityInwardsWaternet(new MacroStabilityInwardsPhreaticLine[0], new MacroStabilityInwardsWaternetLine[0]);
 
             // Call
-            void Call() => PersistableWaternetFactory.Create(waternet, waternet, new IdFactory(), new MacroStabilityInwardsExportRegistry(), null);
+            void Call() => PersistableWaternetFactory.Create(waternet, waternet, null, new IdFactory(), new MacroStabilityInwardsExportRegistry());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -130,7 +129,7 @@
             var registry = new MacroStabilityInwardsExportRegistry();
 
             // Call
-            IEnumerable<PersistableWaternet> persistableWaternets = PersistableWaternetFactory.Create(dailyWaternet, extremeWaternet, idFactory, registry, new GeneralMacroStabilityInwardsInput());
+            IEnumerable<PersistableWaternet> persistableWaternets = PersistableWaternetFactory.Create(dailyWaternet, extremeWaternet, new GeneralMacroStabilityInwardsInput(), idFactory, registry);
 
             // Assert
             PersistableDataModelTestHelper.AssertWaternets(new[]