Index: Riskeer/Common/src/Riskeer.Common.IO/Configurations/Import/CombinedXmlSchemaDefinition.cs
===================================================================
diff -u -r63edc3bfce900e5176e9eb2ba101c7bf06b5a215 -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/Common/src/Riskeer.Common.IO/Configurations/Import/CombinedXmlSchemaDefinition.cs	(.../CombinedXmlSchemaDefinition.cs)	(revision 63edc3bfce900e5176e9eb2ba101c7bf06b5a215)
+++ Riskeer/Common/src/Riskeer.Common.IO/Configurations/Import/CombinedXmlSchemaDefinition.cs	(.../CombinedXmlSchemaDefinition.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -106,10 +106,10 @@
         {
             LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(Input.SoilProfile);
 
-            waternetKernel.SoilModel = SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray());
-            waternetKernel.SoilProfile = SoilProfileCreator.Create(Input.SoilProfile.PreconsolidationStresses, layersWithSoil);
-            waternetKernel.Location = WaternetStabilityLocationCreator.Create(Input);
-            waternetKernel.SurfaceLine = SurfaceLineCreator.Create(Input.SurfaceLine, Input.LandwardDirection);
+            waternetKernel.SetLocation(WaternetStabilityLocationCreator.Create(Input));
+            waternetKernel.SetSoilModel(SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray()));
+            waternetKernel.SetSoilProfile(SoilProfileCreator.Create(Input.SoilProfile.PreconsolidationStresses, layersWithSoil));
+            waternetKernel.SetSurfaceLine(SurfaceLineCreator.Create(Input.SurfaceLine, Input.LandwardDirection));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs	(.../IWaternetKernel.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs	(.../IWaternetKernel.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -39,31 +39,31 @@
     public interface IWaternetKernel
     {
         /// <summary>
+        /// Gets the waternet result.
+        /// </summary>
+        WtiStabilityWaternet Waternet { get; }
+
+        /// <summary>
         /// Sets the location.
         /// </summary>
-        StabilityLocation Location { set; }
+        void SetLocation(StabilityLocation stabilityLocation);
 
         /// <summary>
         /// Sets the soil model.
         /// </summary>
-        SoilModel SoilModel { set; }
+        void SetSoilModel(SoilModel soilModel);
 
         /// <summary>
         /// Sets the soil profile.
         /// </summary>
-        SoilProfile2D SoilProfile { set; }
+        void SetSoilProfile(SoilProfile2D soilProfile);
 
         /// <summary>
         /// Sets the surface line.
         /// </summary>
-        SurfaceLine2 SurfaceLine { set; }
+        void SetSurfaceLine(SurfaceLine2 surfaceLine);
 
         /// <summary>
-        /// Gets the waternet result.
-        /// </summary>
-        WtiStabilityWaternet Waternet { get; }
-
-        /// <summary>
         /// Performs the Waternet calculation.
         /// </summary>
         /// <exception cref="WaternetKernelWrapperException">Thrown when
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetDailyKernelWrapper.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetDailyKernelWrapper.cs	(.../WaternetDailyKernelWrapper.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetDailyKernelWrapper.cs	(.../WaternetDailyKernelWrapper.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -40,12 +40,9 @@
             };
         }
 
-        public override StabilityLocation Location
+        public override void SetLocation(StabilityLocation stabilityLocation)
         {
-            set
-            {
-                StabilityModel.LocationDaily = value;
-            }
+            StabilityModel.LocationDaily = stabilityLocation;
         }
 
         protected override string CreateWaternetXmlResult(WTIStabilityCalculation waternetCalculation)
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetExtremeKernelWrapper.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetExtremeKernelWrapper.cs	(.../WaternetExtremeKernelWrapper.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetExtremeKernelWrapper.cs	(.../WaternetExtremeKernelWrapper.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -32,12 +32,9 @@
     /// </summary>
     internal class WaternetExtremeKernelWrapper : WaternetKernelWrapper
     {
-        public override StabilityLocation Location
+        public override void SetLocation(StabilityLocation stabilityLocation)
         {
-            set
-            {
-                StabilityModel.Location = value;
-            }
+            StabilityModel.Location = stabilityLocation;
         }
 
         protected override string CreateWaternetXmlResult(WTIStabilityCalculation waternetCalculation)
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -44,34 +44,25 @@
             StabilityModel = new StabilityModel();
         }
 
-        public abstract StabilityLocation Location { set; }
+        public WtiStabilityWaternet Waternet { get; private set; }
 
-        public SoilModel SoilModel
+        public abstract void SetLocation(StabilityLocation stabilityLocation);
+
+        public void SetSoilModel(SoilModel soilModel)
         {
-            set
-            {
-                StabilityModel.SoilModel = value;
-            }
+            StabilityModel.SoilModel = soilModel;
         }
 
-        public SoilProfile2D SoilProfile
+        public void SetSoilProfile(SoilProfile2D soilProfile)
         {
-            set
-            {
-                StabilityModel.SoilProfile = value;
-            }
+            StabilityModel.SoilProfile = soilProfile;
         }
 
-        public SurfaceLine2 SurfaceLine
+        public void SetSurfaceLine(SurfaceLine2 surfaceLine)
         {
-            set
-            {
-                StabilityModel.SurfaceLine2 = value;
-            }
+            StabilityModel.SurfaceLine2 = surfaceLine;
         }
 
-        public WtiStabilityWaternet Waternet { get; private set; }
-
         public void Calculate()
         {
             try
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs	(.../WaternetDailyKernelWrapperTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs	(.../WaternetDailyKernelWrapperTest.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -50,13 +50,11 @@
             var surfaceLine = new SurfaceLine2();
 
             // Call
-            var kernel = new WaternetDailyKernelWrapper
-            {
-                Location = stabilityLocation,
-                SoilModel = soilModel,
-                SoilProfile = soilProfile2D,
-                SurfaceLine = surfaceLine
-            };
+            var kernel = new WaternetDailyKernelWrapper();
+            kernel.SetLocation(stabilityLocation);
+            kernel.SetSoilModel(soilModel);
+            kernel.SetSoilProfile(soilProfile2D);
+            kernel.SetSurfaceLine(surfaceLine);
 
             // Assert
             var stabilityModel = TypeUtils.GetProperty<StabilityModel>(kernel, "StabilityModel");
@@ -112,54 +110,54 @@
                 OuterLoop = loop
             };
             var soil = new Soil();
-            return new WaternetDailyKernelWrapper
+            var waternetDailyKernelWrapper = new WaternetDailyKernelWrapper();
+            waternetDailyKernelWrapper.SetLocation(new StabilityLocation());
+            waternetDailyKernelWrapper.SetSoilModel(new SoilModel
             {
-                SurfaceLine = new SurfaceLine2(),
-                Location = new StabilityLocation(),
-                SoilProfile = new SoilProfile2D
+                Soils =
                 {
-                    Geometry = new GeometryData
+                    soil
+                }
+            });
+            waternetDailyKernelWrapper.SetSoilProfile(new SoilProfile2D
+            {
+                Geometry = new GeometryData
+                {
+                    Points =
                     {
-                        Points =
-                        {
-                            point1,
-                            point2,
-                            point3,
-                            point4
-                        },
-                        Curves =
-                        {
-                            curve1,
-                            curve2,
-                            curve3,
-                            curve4
-                        },
-                        Loops =
-                        {
-                            loop
-                        },
-                        Surfaces =
-                        {
-                            geometrySurface
-                        }
+                        point1,
+                        point2,
+                        point3,
+                        point4
                     },
+                    Curves =
+                    {
+                        curve1,
+                        curve2,
+                        curve3,
+                        curve4
+                    },
+                    Loops =
+                    {
+                        loop
+                    },
                     Surfaces =
                     {
-                        new SoilLayer2D
-                        {
-                            GeometrySurface = geometrySurface,
-                            Soil = soil
-                        }
+                        geometrySurface
                     }
                 },
-                SoilModel = new SoilModel
+                Surfaces =
                 {
-                    Soils =
+                    new SoilLayer2D
                     {
-                        soil
+                        GeometrySurface = geometrySurface,
+                        Soil = soil
                     }
                 }
-            };
+            });
+            waternetDailyKernelWrapper.SetSurfaceLine(new SurfaceLine2());
+
+            return waternetDailyKernelWrapper;
         }
 
         private static void AssertAutomaticallySyncedValues(StabilityModel stabilityModel, SoilProfile2D soilProfile2D, SurfaceLine2 surfaceLine)
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs	(.../WaternetExtremeKernelWrapperTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs	(.../WaternetExtremeKernelWrapperTest.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -50,13 +50,11 @@
             var surfaceLine = new SurfaceLine2();
 
             // Call
-            var kernel = new WaternetExtremeKernelWrapper
-            {
-                Location = stabilityLocation,
-                SoilModel = soilModel,
-                SoilProfile = soilProfile2D,
-                SurfaceLine = surfaceLine
-            };
+            var kernel = new WaternetExtremeKernelWrapper();
+            kernel.SetLocation(stabilityLocation);
+            kernel.SetSoilModel(soilModel);
+            kernel.SetSoilProfile(soilProfile2D);
+            kernel.SetSurfaceLine(surfaceLine);
 
             // Assert
             var stabilityModel = TypeUtils.GetProperty<StabilityModel>(kernel, "StabilityModel");
@@ -110,54 +108,54 @@
                 OuterLoop = loop
             };
             var soil = new Soil();
-            return new WaternetExtremeKernelWrapper
+            var waternetExtremeKernelWrapper = new WaternetExtremeKernelWrapper();
+            waternetExtremeKernelWrapper.SetLocation(new StabilityLocation());
+            waternetExtremeKernelWrapper.SetSoilModel(new SoilModel
             {
-                SurfaceLine = new SurfaceLine2(),
-                Location = new StabilityLocation(),
-                SoilProfile = new SoilProfile2D
+                Soils =
                 {
-                    Geometry = new GeometryData
+                    soil
+                }
+            });
+            waternetExtremeKernelWrapper.SetSoilProfile(new SoilProfile2D
+            {
+                Geometry = new GeometryData
+                {
+                    Points =
                     {
-                        Points =
-                        {
-                            point1,
-                            point2,
-                            point3,
-                            point4
-                        },
-                        Curves =
-                        {
-                            curve1,
-                            curve2,
-                            curve3,
-                            curve4
-                        },
-                        Loops =
-                        {
-                            loop
-                        },
-                        Surfaces =
-                        {
-                            geometrySurface
-                        }
+                        point1,
+                        point2,
+                        point3,
+                        point4
                     },
+                    Curves =
+                    {
+                        curve1,
+                        curve2,
+                        curve3,
+                        curve4
+                    },
+                    Loops =
+                    {
+                        loop
+                    },
                     Surfaces =
                     {
-                        new SoilLayer2D
-                        {
-                            GeometrySurface = geometrySurface,
-                            Soil = soil
-                        }
+                        geometrySurface
                     }
                 },
-                SoilModel = new SoilModel
+                Surfaces =
                 {
-                    Soils =
+                    new SoilLayer2D
                     {
-                        soil
+                        GeometrySurface = geometrySurface,
+                        Soil = soil
                     }
                 }
-            };
+            });
+            waternetExtremeKernelWrapper.SetSurfaceLine(new SurfaceLine2());
+
+            return waternetExtremeKernelWrapper;
         }
 
         private static void AssertAutomaticallySyncedValues(StabilityModel stabilityModel, SoilProfile2D soilProfile2D, SurfaceLine2 surfaceLine)
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -52,13 +52,11 @@
             var surfaceLine = new SurfaceLine2();
 
             // Call
-            var kernel = new TestWaternetKernelWrapper
-            {
-                Location = stabilityLocation,
-                SoilModel = soilModel,
-                SoilProfile = soilProfile2D,
-                SurfaceLine = surfaceLine
-            };
+            var kernel = new TestWaternetKernelWrapper();
+            kernel.SetLocation(stabilityLocation);
+            kernel.SetSoilModel(soilModel);
+            kernel.SetSoilProfile(soilProfile2D);
+            kernel.SetSurfaceLine(surfaceLine);
 
             // Assert
             var stabilityModel = TypeUtils.GetProperty<StabilityModel>(kernel, "StabilityModel");
@@ -127,12 +125,9 @@
 
         private class TestWaternetKernelWrapper : WaternetKernelWrapper
         {
-            public override StabilityLocation Location
+            public override void SetLocation(StabilityLocation stabilityLocation)
             {
-                set
-                {
-                    StabilityModel.Location = value;
-                }
+                    StabilityModel.Location = stabilityLocation;
             }
 
             protected override string CreateWaternetXmlResult(WTIStabilityCalculation waternetCalculation)
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r87b2859379de95fc1a835e27c2575009f196cd88
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision 87b2859379de95fc1a835e27c2575009f196cd88)
@@ -52,6 +52,26 @@
 
         public WtiStabilityWaternet Waternet { get; set; }
 
+        public void SetLocation(StabilityLocation stabilityLocation)
+        {
+            Location = stabilityLocation;
+        }
+
+        public void SetSoilModel(SoilModel soilModel)
+        {
+            SoilModel = soilModel;
+        }
+
+        public void SetSoilProfile(SoilProfile2D soilProfile)
+        {
+            SoilProfile = soilProfile;
+        }
+
+        public void SetSurfaceLine(SurfaceLine2 surfaceLine)
+        {
+            SurfaceLine = surfaceLine;
+        }
+
         public void Calculate()
         {
             if (ThrowExceptionOnCalculate)