Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilModelCreator.cs
===================================================================
diff -u -rd53ecda155e9a1e16f01e74d9b7178f4a0d84046 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilModelCreator.cs	(.../SoilModelCreator.cs)	(revision d53ecda155e9a1e16f01e74d9b7178f4a0d84046)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilModelCreator.cs	(.../SoilModelCreator.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -20,31 +20,32 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Deltares.MacroStability.Geometry;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
     /// <summary>
-    /// Creates <see cref="SoilModel"/> instances which are required in a calculation.
+    /// Creates a collection of <see cref="Soil"/> instances which are required in a calculation.
     /// </summary>
     internal static class SoilModelCreator
     {
         /// <summary>
-        /// Creates a <see cref="SoilModel"/> with the given <paramref name="soils"/>
+        /// Creates a collection of <see cref="Soil"/> with the given <paramref name="soils"/>
         /// which can be used in a calculation.
         /// </summary>
-        /// <param name="soils">The array of <see cref="Soil"/> to use in the <see cref="SoilModel"/>.</param>
-        /// <returns>A new <see cref="SoilModel"/> with the <paramref name="soils"/>.</returns>
+        /// <param name="soils">The array of <see cref="Soil"/> to use in the collection of <see cref="Soil"/>.</param>
+        /// <returns>A new collection of <see cref="Soil"/> with the <paramref name="soils"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soils"/> is <c>null</c>.</exception>
-        public static SoilModel Create(Soil[] soils)
+        public static IList<Soil> Create(Soil[] soils)
         {
             if (soils == null)
             {
                 throw new ArgumentNullException(nameof(soils));
             }
 
-            var soilModel = new SoilModel();
-            soilModel.Soils.AddRange(soils);
+            var soilModel = new List<Soil>();
+            soilModel.AddRange(soils);
             return soilModel;
         }
     }
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs
===================================================================
diff -u -radadef7020430ea40a9bbc8e734a56cc803afa35 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision adadef7020430ea40a9bbc8e734a56cc803afa35)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -79,7 +79,7 @@
         /// <summary>
         /// Sets the soil model.
         /// </summary>
-        void SetSoilModel(SoilModel soilModel);
+        void SetSoilModel(IList<Soil> soilModel);
 
         /// <summary>
         /// Sets the soil profile.
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision d11571aac4a3ec206f9a4279369d446859e9edbf)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -129,9 +129,9 @@
             stabilityModel.SlipCircle.Auto = gridAutomaticDetermined;
         }
 
-        public void SetSoilModel(SoilModel soilModel)
+        public void SetSoilModel(IList<Soil> soilModel)
         {
-            stabilityModel.SoilModel = soilModel;
+            stabilityModel.Soils = soilModel;
         }
 
         public void SetSoilProfile(SoilProfile2D soilProfile)
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs
===================================================================
diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs	(.../IWaternetKernel.cs)	(revision d11571aac4a3ec206f9a4279369d446859e9edbf)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs	(.../IWaternetKernel.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.WaternetCreator;
 using Deltares.WTIStability;
@@ -53,7 +54,7 @@
         /// <summary>
         /// Sets the soil model.
         /// </summary>
-        void SetSoilModel(SoilModel soilModel);
+        void SetSoilModel(IList<Soil> soilModel);
 
         /// <summary>
         /// Sets the soil profile.
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs
===================================================================
diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision d11571aac4a3ec206f9a4279369d446859e9edbf)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -49,9 +49,9 @@
 
         public abstract void SetLocation(Location stabilityLocation);
 
-        public void SetSoilModel(SoilModel soilModel)
+        public void SetSoilModel(IList<Soil> soilModel)
         {
-            StabilityModel.SoilModel = soilModel;
+            StabilityModel.Soils.AddRange(soilModel);
         }
 
         public void SetSoilProfile(SoilProfile2D soilProfile)
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilModelCreatorTest.cs
===================================================================
diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilModelCreatorTest.cs	(.../SoilModelCreatorTest.cs)	(revision d11571aac4a3ec206f9a4279369d446859e9edbf)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilModelCreatorTest.cs	(.../SoilModelCreatorTest.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Deltares.MacroStability.Geometry;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
@@ -51,10 +52,10 @@
             };
 
             // Call
-            SoilModel soilModel = SoilModelCreator.Create(soils);
+            IList<Soil> soilModel = SoilModelCreator.Create(soils);
 
             // Assert
-            CollectionAssert.AreEqual(soils, soilModel.Soils);
+            CollectionAssert.AreEqual(soils, soilModel);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -radadef7020430ea40a9bbc8e734a56cc803afa35 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision adadef7020430ea40a9bbc8e734a56cc803afa35)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Schema;
 using Core.Common.TestUtil;
@@ -59,7 +60,7 @@
         {
             // Setup
             var random = new Random(21);
-            var soilModel = new SoilModel();
+            var soilModel = new List<Soil>();
             var soilProfile2D = new SoilProfile2D();
             var stabilityLocationExtreme = new Location();
             var stabilityLocationDaily = new Location();
@@ -223,12 +224,10 @@
                 OuterLoop = loop
             };
             var kernelWrapper = new UpliftVanKernelWrapper();
-            kernelWrapper.SetSoilModel(new SoilModel
+            kernelWrapper.SetSoilModel(new List<Soil>
             {
-                Soils =
-                {
-                    soil
-                }});
+                soil
+            });
             kernelWrapper.SetSoilProfile(new SoilProfile2D
             {
                 Geometry = new GeometryData
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs
===================================================================
diff -u -radadef7020430ea40a9bbc8e734a56cc803afa35 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs	(.../WaternetDailyKernelWrapperTest.cs)	(revision adadef7020430ea40a9bbc8e734a56cc803afa35)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs	(.../WaternetDailyKernelWrapperTest.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using Core.Common.Util.Reflection;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
@@ -46,7 +47,7 @@
         {
             // Setup
             var stabilityLocation = new Location();
-            var soilModel = new SoilModel();
+            var soilModel = new List<Soil>();
             var soilProfile2D = new SoilProfile2D();
             var surfaceLine = new SurfaceLine2();
 
@@ -113,12 +114,9 @@
             var soil = new Soil();
             var waternetDailyKernelWrapper = new WaternetDailyKernelWrapper();
             waternetDailyKernelWrapper.SetLocation(new Location());
-            waternetDailyKernelWrapper.SetSoilModel(new SoilModel
+            waternetDailyKernelWrapper.SetSoilModel(new List<Soil>
             {
-                Soils =
-                {
-                    soil
-                }
+                soil
             });
             waternetDailyKernelWrapper.SetSoilProfile(new SoilProfile2D
             {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs
===================================================================
diff -u -radadef7020430ea40a9bbc8e734a56cc803afa35 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs	(.../WaternetExtremeKernelWrapperTest.cs)	(revision adadef7020430ea40a9bbc8e734a56cc803afa35)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs	(.../WaternetExtremeKernelWrapperTest.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using Core.Common.Util.Reflection;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
@@ -46,7 +47,7 @@
         {
             // Setup
             var stabilityLocation = new Location();
-            var soilModel = new SoilModel();
+            var soilModel = new List<Soil>();
             var soilProfile2D = new SoilProfile2D();
             var surfaceLine = new SurfaceLine2();
 
@@ -111,12 +112,9 @@
             var soil = new Soil();
             var waternetExtremeKernelWrapper = new WaternetExtremeKernelWrapper();
             waternetExtremeKernelWrapper.SetLocation(new Location());
-            waternetExtremeKernelWrapper.SetSoilModel(new SoilModel
+            waternetExtremeKernelWrapper.SetSoilModel(new List<Soil>
             {
-                Soils =
-                {
-                    soil
-                }
+                soil
             });
             waternetExtremeKernelWrapper.SetSoilProfile(new SoilProfile2D
             {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs
===================================================================
diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision d11571aac4a3ec206f9a4279369d446859e9edbf)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using Core.Common.Util.Reflection;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
@@ -49,7 +50,7 @@
         {
             // Setup
             var stabilityLocation = new Location();
-            var soilModel = new SoilModel();
+            var soilModel = new List<Soil>();
             var soilProfile2D = new SoilProfile2D();
             var surfaceLine = new SurfaceLine2();
 
@@ -65,7 +66,7 @@
 
             Assert.AreSame(stabilityLocation, stabilityModel.Location);
             Assert.AreSame(surfaceLine, stabilityModel.SurfaceLine2);
-            Assert.AreSame(soilModel, stabilityModel.SoilModel);
+            Assert.AreSame(soilModel, stabilityModel.Soils);
             Assert.AreSame(soilProfile2D, stabilityModel.SoilProfile);
 
             AssertIrrelevantValues(stabilityModel);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs
===================================================================
diff -u -rdc126914879ad729a3c46d72b3f09ff283fda8b8 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs	(.../KernelInputAssert.cs)	(revision dc126914879ad729a3c46d72b3f09ff283fda8b8)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs	(.../KernelInputAssert.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.WaternetCreator;
@@ -34,17 +36,17 @@
         /// <summary>
         /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
         /// </summary>
-        /// <param name="expected">The expected <see cref="SoilModel"/>.</param>
-        /// <param name="actual">The actual <see cref="SoilModel"/>.</param>
+        /// <param name="expected">The expected collection of <see cref="Soil"/>.</param>
+        /// <param name="actual">The actual collection of <see cref="Soil"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertSoilModels(SoilModel expected, SoilModel actual)
+        public static void AssertSoilModels(IList<Soil> expected, IList<Soil> actual)
         {
-            Assert.AreEqual(expected.Soils.Count, actual.Soils.Count);
+            Assert.AreEqual(expected.Count, actual.Count);
 
-            for (var i = 0; i < expected.Soils.Count; i++)
+            for (var i = 0; i < expected.Count; i++)
             {
-                AssertSoils(expected.Soils[i], actual.Soils[i]);
+                AssertSoils(expected[i], actual[i]);
             }
         }
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs
===================================================================
diff -u -radadef7020430ea40a9bbc8e734a56cc803afa35 -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs	(.../UpliftVanKernelStub.cs)	(revision adadef7020430ea40a9bbc8e734a56cc803afa35)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs	(.../UpliftVanKernelStub.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -64,7 +64,7 @@
         /// </summary>
         public bool ReturnLogMessages { get; set; }
 
-        public SoilModel SoilModel { get; private set; }
+        public IList<Soil> SoilModel { get; private set; }
 
         public SoilProfile2D SoilProfile { get; private set; }
 
@@ -98,7 +98,7 @@
 
         public IEnumerable<LogMessage> CalculationMessages { get; set; }
 
-        public void SetSoilModel(SoilModel soilModel)
+        public void SetSoilModel(IList<Soil> soilModel)
         {
             SoilModel = soilModel;
         }
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs
===================================================================
diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision d11571aac4a3ec206f9a4279369d446859e9edbf)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.WaternetCreator;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.Waternet;
@@ -42,13 +43,13 @@
         /// </summary>
         public bool ThrowExceptionOnCalculate { get; set; }
 
-        public Location Location { get; set; }
+        public Location Location { get; private set; }
 
-        public SoilModel SoilModel { get; set; }
+        public IList<Soil> SoilModel { get; private set; }
 
-        public SoilProfile2D SoilProfile { get; set; }
+        public SoilProfile2D SoilProfile { get; private set; }
 
-        public SurfaceLine2 SurfaceLine { get; set; }
+        public SurfaceLine2 SurfaceLine { get; private set; }
 
         public WtiStabilityWaternet Waternet { get; set; }
 
@@ -57,7 +58,7 @@
             Location = stabilityLocation;
         }
 
-        public void SetSoilModel(SoilModel soilModel)
+        public void SetSoilModel(IList<Soil> soilModel)
         {
             SoilModel = soilModel;
         }