Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs
===================================================================
diff -u -rfe26eb5e452792f9c2ebd62a737a35642210d2f3 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs	(.../MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs)	(revision fe26eb5e452792f9c2ebd62a737a35642210d2f3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs	(.../MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -22,7 +22,6 @@
 using System;
 using Application.Ringtoets.Storage.DbContext;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Create.MacroStabilityInwards
 {
@@ -81,7 +80,7 @@
         /// <param name="registry">The registry to use for persisting entities.</param>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="soilProfile"/> is 
         /// not of type <see cref="MacroStabilityInwardsSoilProfile1D"/> or <see cref="MacroStabilityInwardsSoilProfile2D"/>.</exception>
-        private static void AddEntityForProfile(IMacroStabilityInwardsSoilProfile soilProfile,
+        private static void AddEntityForProfile(IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> soilProfile,
                                                 MacroStabilityInwardsStochasticSoilProfileEntity entity,
                                                 PersistenceRegistry registry)
         {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs
===================================================================
diff -u -r4afb3d635232a5570c867f890f2c8b4f973ea7f7 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs)	(revision 4afb3d635232a5570c867f890f2c8b4f973ea7f7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -22,7 +22,6 @@
 using System;
 using Application.Ringtoets.Storage.DbContext;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Read.MacroStabilityInwards
 {
@@ -65,22 +64,22 @@
             return stochasticSoilProfile;
         }
 
-        private static IMacroStabilityInwardsSoilProfile ReadSoilProfile(this MacroStabilityInwardsStochasticSoilProfileEntity entity,
-                                                                         ReadConversionCollector collector)
+        private static IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> ReadSoilProfile(this MacroStabilityInwardsStochasticSoilProfileEntity entity,
+                                                                                                          ReadConversionCollector collector)
         {
             return entity.MacroStabilityInwardsSoilProfileOneDEntity != null
                        ? ReadSoilProfile1D(entity, collector)
                        : ReadSoilProfile2D(entity, collector);
         }
 
-        private static IMacroStabilityInwardsSoilProfile ReadSoilProfile1D(this MacroStabilityInwardsStochasticSoilProfileEntity entity,
-                                                                           ReadConversionCollector collector)
+        private static IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> ReadSoilProfile1D(this MacroStabilityInwardsStochasticSoilProfileEntity entity,
+                                                                                                            ReadConversionCollector collector)
         {
             return entity.MacroStabilityInwardsSoilProfileOneDEntity.Read(collector);
         }
 
-        private static IMacroStabilityInwardsSoilProfile ReadSoilProfile2D(this MacroStabilityInwardsStochasticSoilProfileEntity entity,
-                                                                           ReadConversionCollector collector)
+        private static IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> ReadSoilProfile2D(this MacroStabilityInwardsStochasticSoilProfileEntity entity,
+                                                                                                            ReadConversionCollector collector)
         {
             return entity.MacroStabilityInwardsSoilProfileTwoDEntity.Read(collector);
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensionsTest.cs
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensionsTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileCreateExtensionsTest.cs)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensionsTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileCreateExtensionsTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -27,7 +27,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile;
 
 namespace Application.Ringtoets.Storage.Test.Create.MacroStabilityInwards
@@ -54,7 +53,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var soilProfile = mockRepository.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mockRepository.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mockRepository.ReplayAll();
 
             var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0, soilProfile);
@@ -179,7 +178,7 @@
 
         [Test]
         [TestCaseSource(nameof(GetMacroStabilityInwardsSoilProfiles))]
-        public void GivenCreatedEntity_WhenCreateCalledOnSameObject_ThenSameEntityInstanceReturned(IMacroStabilityInwardsSoilProfile soilProfile)
+        public void GivenCreatedEntity_WhenCreateCalledOnSameObject_ThenSameEntityInstanceReturned(IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> soilProfile)
         {
             // Given
             var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.4, soilProfile);
@@ -194,12 +193,13 @@
             Assert.AreSame(entity1, entity2);
         }
 
-        private class UnsupportedMacroStabilityInwardsSoilProfile : IMacroStabilityInwardsSoilProfile
+        private class UnsupportedMacroStabilityInwardsSoilProfile : IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>
         {
             public string Name { get; }
+            public IEnumerable<IMacroStabilityInwardsSoilLayer> Layers { get; }
         }
 
-        private static IEnumerable<IMacroStabilityInwardsSoilProfile> GetMacroStabilityInwardsSoilProfiles()
+        private static IEnumerable<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>> GetMacroStabilityInwardsSoilProfiles()
         {
             yield return MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D();
             yield return MacroStabilityInwardsSoilProfile2DTestFactory.CreateMacroStabilityInwardsSoilProfile2D();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -481,7 +481,7 @@
 
             protected override MacroStabilityInwardsStochasticSoilProfile CreateDataModel()
             {
-                var soilProfile = mockRepository.Stub<IMacroStabilityInwardsSoilProfile>();
+                var soilProfile = mockRepository.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
                 mockRepository.ReplayAll();
 
                 return new MacroStabilityInwardsStochasticSoilProfile(0, soilProfile);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensionsTest.cs
===================================================================
diff -u -r6b60edb4d7f04f83c74089d70a72c4f79ed413dd -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityReadExtensionsTest.cs)	(revision 6b60edb4d7f04f83c74089d70a72c4f79ed413dd)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityReadExtensionsTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -86,7 +86,7 @@
             Assert.IsNotNull(stochasticSoilProfile);
             Assert.AreEqual(entity.Probability, stochasticSoilProfile.Probability, 1e-6);
 
-            IMacroStabilityInwardsSoilProfile profile = stochasticSoilProfile.SoilProfile;
+            IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> profile = stochasticSoilProfile.SoilProfile;
             Assert.IsInstanceOf<MacroStabilityInwardsSoilProfile1D>(profile);
             Assert.AreEqual(entity.MacroStabilityInwardsSoilProfileOneDEntity.Name, profile.Name);
         }
@@ -117,7 +117,7 @@
             Assert.IsNotNull(stochasticSoilProfile);
             Assert.AreEqual(entity.Probability, stochasticSoilProfile.Probability, 1e-6);
 
-            IMacroStabilityInwardsSoilProfile profile = stochasticSoilProfile.SoilProfile;
+            IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> profile = stochasticSoilProfile.SoilProfile;
             Assert.IsInstanceOf<MacroStabilityInwardsSoilProfile2D>(profile);
             Assert.AreEqual(entity.MacroStabilityInwardsSoilProfileTwoDEntity.Name, profile.Name);
         }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -69,6 +69,7 @@
     </Compile>
     <Compile Include="MacroStabilityInwardsProbabilityAssessmentInput.cs" />
     <Compile Include="MacroStabilityInwardsSurfaceLineCollection.cs" />
+    <Compile Include="SoilProfile\IMacroStabilityInwardsSoilLayer.cs" />
     <Compile Include="SoilProfile\IMacroStabilityInwardsSoilProfile.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsPreconsolidationStress.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsSoilLayer1D.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilLayer.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilLayer.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilLayer.cs	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
+{
+    /// <summary>
+    /// Interface for the different types of soil layer that can be used in macro stability inwards.
+    /// </summary>
+    public interface IMacroStabilityInwardsSoilLayer
+    {
+        /// <summary>
+        /// Gets the data of the soil layer.
+        /// </summary>
+        MacroStabilityInwardsSoilLayerData Data { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilProfile.cs
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilProfile.cs	(.../IMacroStabilityInwardsSoilProfile.cs)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilProfile.cs	(.../IMacroStabilityInwardsSoilProfile.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -19,16 +19,24 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
+
 namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
 {
     /// <summary>
     /// Interface for the different types of soil profile that can be used in macro stability inwards.
     /// </summary>
-    public interface IMacroStabilityInwardsSoilProfile
+    /// <typeparam name="T">The type of the soil profile.</typeparam>
+    public interface IMacroStabilityInwardsSoilProfile<out T> where T : IMacroStabilityInwardsSoilLayer
     {
         /// <summary>
         /// Gets the name of the soil profile.
         /// </summary>
         string Name { get; }
+
+        /// <summary>
+        /// Gets an <see cref="IEnumerable{T}"/> containing the layers of the soil profile.
+        /// </summary>
+        IEnumerable<T> Layers { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer1D.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer1D.cs	(.../MacroStabilityInwardsSoilLayer1D.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer1D.cs	(.../MacroStabilityInwardsSoilLayer1D.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -24,7 +24,7 @@
     /// <summary>
     /// This class represents a 1D layer that was imported from D-Soil Model.
     /// </summary>
-    public class MacroStabilityInwardsSoilLayer1D
+    public class MacroStabilityInwardsSoilLayer1D : IMacroStabilityInwardsSoilLayer
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer1D"/>, where the top is set to <paramref name="top"/>.
@@ -37,15 +37,12 @@
         }
 
         /// <summary>
-        /// Gets the data of the <see cref="MacroStabilityInwardsSoilLayer1D"/>.
-        /// </summary>
-        public MacroStabilityInwardsSoilLayerData Data { get; }
-
-        /// <summary>
         /// Gets the top level of the <see cref="MacroStabilityInwardsSoilLayer1D"/>.
         /// </summary>
         public double Top { get; }
 
+        public MacroStabilityInwardsSoilLayerData Data { get; }
+
         public override bool Equals(object obj)
         {
             if (ReferenceEquals(null, obj))
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer2D.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer2D.cs	(.../MacroStabilityInwardsSoilLayer2D.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer2D.cs	(.../MacroStabilityInwardsSoilLayer2D.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -28,14 +28,14 @@
     /// <summary>
     /// This class represents a 2D layer that was imported from D-Soil Model.
     /// </summary>
-    public class MacroStabilityInwardsSoilLayer2D
+    public class MacroStabilityInwardsSoilLayer2D : IMacroStabilityInwardsSoilLayer
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2D"/>.
         /// </summary>
         /// <param name="outerRing">The ring describing the outer boundaries of the layer.</param>
         /// <param name="holes">The rings describing the holes within the outer boundaries of 
-        ///     the layer.</param>
+        /// the layer.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public MacroStabilityInwardsSoilLayer2D(Ring outerRing, IEnumerable<Ring> holes)
         {
@@ -54,11 +54,6 @@
         }
 
         /// <summary>
-        /// Gets the data of the <see cref="MacroStabilityInwardsSoilLayer2D"/>.
-        /// </summary>
-        public MacroStabilityInwardsSoilLayerData Data { get; }
-
-        /// <summary>
         /// Gets the outer ring of the polygon with holes describing the surface of the <see cref="MacroStabilityInwardsSoilLayer2D"/>.
         /// </summary>
         public Ring OuterRing { get; }
@@ -68,6 +63,8 @@
         /// </summary>
         public Ring[] Holes { get; }
 
+        public MacroStabilityInwardsSoilLayerData Data { get; }
+
         public override bool Equals(object obj)
         {
             if (ReferenceEquals(null, obj))
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile1D.cs
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile1D.cs	(.../MacroStabilityInwardsSoilProfile1D.cs)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile1D.cs	(.../MacroStabilityInwardsSoilProfile1D.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -29,7 +29,7 @@
     /// <summary>
     /// This class represents a soil profile, which was imported for use in a macro stability inwards calculation.
     /// </summary>
-    public class MacroStabilityInwardsSoilProfile1D : IMacroStabilityInwardsSoilProfile
+    public class MacroStabilityInwardsSoilProfile1D : IMacroStabilityInwardsSoilProfile<MacroStabilityInwardsSoilLayer1D>
     {
         private MacroStabilityInwardsSoilLayer1D[] layers;
         private string name;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2D.cs
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2D.cs	(.../MacroStabilityInwardsSoilProfile2D.cs)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2D.cs	(.../MacroStabilityInwardsSoilProfile2D.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -29,7 +29,7 @@
     /// <summary>
     /// This class represents a soil profile, which was imported for use in a macro stability inwards calculation.
     /// </summary>
-    public class MacroStabilityInwardsSoilProfile2D : IMacroStabilityInwardsSoilProfile
+    public class MacroStabilityInwardsSoilProfile2D : IMacroStabilityInwardsSoilProfile<MacroStabilityInwardsSoilLayer2D>
     {
         private MacroStabilityInwardsSoilLayer2D[] layers;
         private string name;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs
===================================================================
diff -u -rf2838b78c54529e9b15208b44de854f7760e350f -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs)	(revision f2838b78c54529e9b15208b44de854f7760e350f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -44,7 +44,7 @@
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="NotSupportedException">Thrown when the given <paramref name="soilProfile"/> type
         /// is not supported.</exception>
-        public static MacroStabilityInwardsSoilProfileUnderSurfaceLine Create(IMacroStabilityInwardsSoilProfile soilProfile,
+        public static MacroStabilityInwardsSoilProfileUnderSurfaceLine Create(IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> soilProfile,
                                                                               MacroStabilityInwardsSurfaceLine surfaceLine)
         {
             if (soilProfile == null)
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilModel.cs
===================================================================
diff -u -re0ee945d52cc611d081c9a1412e92023a63f91c9 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilModel.cs	(.../MacroStabilityInwardsStochasticSoilModel.cs)	(revision e0ee945d52cc611d081c9a1412e92023a63f91c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilModel.cs	(.../MacroStabilityInwardsStochasticSoilModel.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -121,7 +121,7 @@
             Name = fromModel.Name;
             Geometry = fromModel.Geometry;
 
-            var newSoilProfiles = new List<IMacroStabilityInwardsSoilProfile>();
+            var newSoilProfiles = new List<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             var updatedProfiles = new List<MacroStabilityInwardsStochasticSoilProfile>();
             var addedProfiles = new List<MacroStabilityInwardsStochasticSoilProfile>();
             var removedProfiles = new List<MacroStabilityInwardsStochasticSoilProfile>();
@@ -162,7 +162,7 @@
             return Name;
         }
 
-        private static bool IsSame(IMacroStabilityInwardsSoilProfile soilProfile, IMacroStabilityInwardsSoilProfile otherSoilProfile)
+        private static bool IsSame(IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> soilProfile, IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> otherSoilProfile)
         {
             bool equalNames = soilProfile.Name.Equals(otherSoilProfile.Name);
             bool equalTypes = soilProfile.GetType() == otherSoilProfile.GetType();
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilProfile.cs
===================================================================
diff -u -r24b83255132a74a750cc322321b460c14e407917 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilProfile.cs	(.../MacroStabilityInwardsStochasticSoilProfile.cs)	(revision 24b83255132a74a750cc322321b460c14e407917)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilProfile.cs	(.../MacroStabilityInwardsStochasticSoilProfile.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -27,7 +27,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
 {
     /// <summary>
-    /// This class couples a <see cref="IMacroStabilityInwardsSoilProfile"/> 
+    /// This class couples a <see cref="IMacroStabilityInwardsSoilProfile{T}"/> 
     /// to a probability of occurrence.
     /// </summary>
     public class MacroStabilityInwardsStochasticSoilProfile : Observable
@@ -43,7 +43,7 @@
         /// is <c>null</c>.</exception>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when the <paramref name="probability"/>
         /// is outside the range [0, 1].</exception>
-        public MacroStabilityInwardsStochasticSoilProfile(double probability, IMacroStabilityInwardsSoilProfile soilProfile)
+        public MacroStabilityInwardsStochasticSoilProfile(double probability, IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> soilProfile)
         {
             if (soilProfile == null)
             {
@@ -54,9 +54,9 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="IMacroStabilityInwardsSoilProfile"/>.
+        /// Gets the <see cref="IMacroStabilityInwardsSoilProfile{T}"/>.
         /// </summary>
-        public IMacroStabilityInwardsSoilProfile SoilProfile { get; private set; }
+        public IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> SoilProfile { get; private set; }
 
         /// <summary>
         /// Gets the probability of the stochastic soil profile.
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs
===================================================================
diff -u -r9fa257acbd8aeded7918b346a8e120fdc80f95b0 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 9fa257acbd8aeded7918b346a8e120fdc80f95b0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
@@ -28,7 +27,6 @@
 using Core.Components.Chart.Forms;
 using Ringtoets.Common.Forms.Factories;
 using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.Factories;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -163,21 +161,7 @@
 
         private void UpdateTableData()
         {
-            var soilLayerData = new List<MacroStabilityInwardsSoilLayerData>();
-
-            var profile1D = data?.InputParameters.StochasticSoilProfile?.SoilProfile as MacroStabilityInwardsSoilProfile1D;
-            var profile2D = data?.InputParameters.StochasticSoilProfile?.SoilProfile as MacroStabilityInwardsSoilProfile2D;
-
-            if (profile1D != null)
-            {
-                soilLayerData.AddRange(profile1D.Layers.Select(l => l.Data));
-            }
-            else if (profile2D != null)
-            {
-                soilLayerData.AddRange(profile2D.Layers.Select(l => l.Data));
-            }
-
-            soilLayerDataTable.SetData(soilLayerData);
+            soilLayerDataTable.SetData(data?.InputParameters.StochasticSoilProfile?.SoilProfile.Layers.Select(l => l.Data));
         }
 
         private void UpdateChartTitle()
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSoilLayerDataTable.cs
===================================================================
diff -u -r9fa257acbd8aeded7918b346a8e120fdc80f95b0 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSoilLayerDataTable.cs	(.../MacroStabilityInwardsSoilLayerDataTable.cs)	(revision 9fa257acbd8aeded7918b346a8e120fdc80f95b0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSoilLayerDataTable.cs	(.../MacroStabilityInwardsSoilLayerDataTable.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -50,7 +50,7 @@
         /// are shown in the table.
         /// </summary>
         /// <param name="layers">The collection of layers to show.</param>
-        public void SetData(IEnumerable<MacroStabilityInwardsSoilLayerData> layers)
+        public void SetData(IEnumerable<IMacroStabilityInwardsSoilLayerData> layers)
         {
             SetDataSource(layers?.Select(l => new FormattedMacroStabilityInwardsSoilLayerDataRow(l)).ToArray());
         }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilProfileTransformer.cs
===================================================================
diff -u -re343b677ebba0cff9ce37025214aa3109af39a1a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilProfileTransformer.cs	(.../MacroStabilityInwardsSoilProfileTransformer.cs)	(revision e343b677ebba0cff9ce37025214aa3109af39a1a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilProfileTransformer.cs	(.../MacroStabilityInwardsSoilProfileTransformer.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -35,14 +35,14 @@
     internal static class MacroStabilityInwardsSoilProfileTransformer
     {
         /// <summary>
-        /// Transforms the generic <paramref name="soilProfile"/> into an <see cref="IMacroStabilityInwardsSoilProfile"/>.
+        /// Transforms the generic <paramref name="soilProfile"/> into an <see cref="IMacroStabilityInwardsSoilProfile{T}"/>.
         /// </summary>
         /// <param name="soilProfile">The soil profile to use in the transformation.</param>
-        /// <returns>A new <see cref="IMacroStabilityInwardsSoilProfile"/> based on the given data.</returns>
+        /// <returns>A new <see cref="IMacroStabilityInwardsSoilProfile{T}"/> based on the given data.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilProfile"/> is <c>null</c>.</exception>
         /// <exception cref="ImportedDataTransformException">Thrown when transformation would not result
         /// in a valid transformed instance.</exception>
-        public static IMacroStabilityInwardsSoilProfile Transform(ISoilProfile soilProfile)
+        public static IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> Transform(ISoilProfile soilProfile)
         {
             if (soilProfile == null)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformer.cs
===================================================================
diff -u -rd3326e4a3f2df115659c90f378321ed9b9ab69d1 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformer.cs	(.../MacroStabilityInwardsStochasticSoilModelTransformer.cs)	(revision d3326e4a3f2df115659c90f378321ed9b9ab69d1)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformer.cs	(.../MacroStabilityInwardsStochasticSoilModelTransformer.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -35,7 +35,7 @@
     /// </summary>
     public class MacroStabilityInwardsStochasticSoilModelTransformer : IStochasticSoilModelTransformer<MacroStabilityInwardsStochasticSoilModel>
     {
-        private readonly Dictionary<ISoilProfile, IMacroStabilityInwardsSoilProfile> soilProfiles = new Dictionary<ISoilProfile, IMacroStabilityInwardsSoilProfile>();
+        private readonly Dictionary<ISoilProfile, IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>> soilProfiles = new Dictionary<ISoilProfile, IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
 
         public MacroStabilityInwardsStochasticSoilModel Transform(StochasticSoilModel stochasticSoilModel)
         {
@@ -87,15 +87,15 @@
         }
 
         /// <summary>
-        /// Transforms all generic <see cref="ISoilProfile"/> into <see cref="IMacroStabilityInwardsSoilProfile"/>.
+        /// Transforms all generic <see cref="ISoilProfile"/> into <see cref="IMacroStabilityInwardsSoilProfile{T}"/>.
         /// </summary>
         /// <param name="soilProfile">The soil profile to use in the transformation.</param>
         /// <returns>The transformed soil profile.</returns>
         /// <exception cref="ImportedDataTransformException">Thrown when transformation would 
         /// not result in a valid transformed instance.</exception>
-        private IMacroStabilityInwardsSoilProfile GetTransformedSoilProfile(ISoilProfile soilProfile)
+        private IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> GetTransformedSoilProfile(ISoilProfile soilProfile)
         {
-            IMacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile;
+            IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> macroStabilityInwardsSoilProfile;
             if (soilProfiles.ContainsKey(soilProfile))
             {
                 macroStabilityInwardsSoilProfile = soilProfiles[soilProfile];
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformer.cs
===================================================================
diff -u -re343b677ebba0cff9ce37025214aa3109af39a1a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformer.cs	(.../MacroStabilityInwardsStochasticSoilProfileTransformer.cs)	(revision e343b677ebba0cff9ce37025214aa3109af39a1a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformer.cs	(.../MacroStabilityInwardsStochasticSoilProfileTransformer.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -44,7 +44,7 @@
         /// <exception cref="ImportedDataTransformException">Thrown when <see cref="StochasticSoilProfile"/>
         /// could not be transformed.</exception>
         public static MacroStabilityInwardsStochasticSoilProfile Transform(StochasticSoilProfile stochasticSoilProfile,
-                                                                           IMacroStabilityInwardsSoilProfile soilProfile)
+                                                                           IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> soilProfile)
         {
             if (stochasticSoilProfile == null)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -86,7 +86,7 @@
 
         private IEnumerable<IObservable> UpdateStochasticSoilModel(MacroStabilityInwardsStochasticSoilModel modelToUpdate, MacroStabilityInwardsStochasticSoilModel modelToUpdateFrom)
         {
-            Dictionary<MacroStabilityInwardsStochasticSoilProfile, IMacroStabilityInwardsSoilProfile> oldProfiles = modelToUpdate
+            Dictionary<MacroStabilityInwardsStochasticSoilProfile, IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>> oldProfiles = modelToUpdate
                 .StochasticSoilProfiles
                 .ToDictionary(ssp => ssp, ssp => ssp.SoilProfile, new ReferenceEqualityComparer<MacroStabilityInwardsStochasticSoilProfile>());
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile1DTest.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile1DTest.cs	(.../MacroStabilityInwardsSoilProfile1DTest.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile1DTest.cs	(.../MacroStabilityInwardsSoilProfile1DTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -49,7 +49,7 @@
             var profile = new MacroStabilityInwardsSoilProfile1D(name, bottom, layers);
 
             // Assert
-            Assert.IsInstanceOf<IMacroStabilityInwardsSoilProfile>(profile);
+            Assert.IsInstanceOf<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>(profile);
             Assert.AreNotSame(layers, profile.Layers);
             Assert.AreEqual(name, profile.Name);
             Assert.AreEqual(bottom, profile.Bottom);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs
===================================================================
diff -u -r31f59cfc48a6839453e372572d03ecc6ae6f0d00 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs	(.../MacroStabilityInwardsSoilProfile2DTest.cs)	(revision 31f59cfc48a6839453e372572d03ecc6ae6f0d00)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs	(.../MacroStabilityInwardsSoilProfile2DTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -56,7 +56,7 @@
             var profile = new MacroStabilityInwardsSoilProfile2D(name, layers, preconsolidationStresses);
 
             // Assert
-            Assert.IsInstanceOf<IMacroStabilityInwardsSoilProfile>(profile);
+            Assert.IsInstanceOf<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>(profile);
             Assert.AreNotSame(layers, profile.Layers);
             TestHelper.AssertCollectionsAreEqual(layers, profile.Layers,
                                                  new ReferenceEqualityComparer<MacroStabilityInwardsSoilLayer2D>());
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs
===================================================================
diff -u -r3ccf9060ac18a68862898c4c509a41b1bc2f3ea7 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs)	(revision 3ccf9060ac18a68862898c4c509a41b1bc2f3ea7)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -74,7 +74,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs
===================================================================
diff -u -raf575930a392dbf1fb1d5073f3df48110af72686 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTest.cs)	(revision af575930a392dbf1fb1d5073f3df48110af72686)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -482,7 +482,7 @@
             Assert.AreEqual(name, stochasticSoilModel.ToString());
         }
 
-        private static IMacroStabilityInwardsSoilProfile CreateMacroStabilityInwardsSoilProfile1D(string name)
+        private static IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer> CreateMacroStabilityInwardsSoilProfile1D(string name)
         {
             return new MacroStabilityInwardsSoilProfile1D(name, 0.0, new Collection<MacroStabilityInwardsSoilLayer1D>
             {
@@ -496,7 +496,7 @@
             });
         }
 
-        private class TestSoilProfile : IMacroStabilityInwardsSoilProfile
+        private class TestSoilProfile : IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>
         {
             public TestSoilProfile() {}
 
@@ -507,6 +507,8 @@
 
             public string Name { get; } = "";
 
+            public IEnumerable<IMacroStabilityInwardsSoilLayer> Layers { get; }
+
             public override bool Equals(object obj)
             {
                 if (ReferenceEquals(null, obj))
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.Base;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -47,7 +48,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             double probability = new Random(21).Next(0, 1);
@@ -73,7 +74,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             // Call
@@ -91,7 +92,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -123,7 +124,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -141,7 +142,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -174,7 +175,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticSoilProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile);
@@ -194,7 +195,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -269,7 +270,7 @@
             return new string('x', random.Next(0, 40));
         }
 
-        private class TestSoilProfile : IMacroStabilityInwardsSoilProfile
+        private class TestSoilProfile : IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>
         {
             public TestSoilProfile(string name)
             {
@@ -278,14 +279,16 @@
 
             public string Name { get; }
 
+            public IEnumerable<IMacroStabilityInwardsSoilLayer> Layers { get; }
+
             public override int GetHashCode()
             {
                 return 0;
             }
 
             public override bool Equals(object obj)
             {
-                var other = obj as IMacroStabilityInwardsSoilProfile;
+                var other = obj as IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>;
                 return other != null && Name.Equals(other.Name);
             }
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs
===================================================================
diff -u -r66893bb1248edc38de9409e959984dad5a4a6af6 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs)	(revision 66893bb1248edc38de9409e959984dad5a4a6af6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -390,9 +390,10 @@
                                                         new Ring[0]);
         }
 
-        private class UnsupportedSoilProfile : IMacroStabilityInwardsSoilProfile
+        private class UnsupportedSoilProfile : IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>
         {
             public string Name { get; }
+            public IEnumerable<IMacroStabilityInwardsSoilLayer> Layers { get; }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformerTest.cs
===================================================================
diff -u -re343b677ebba0cff9ce37025214aa3109af39a1a -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformerTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTransformerTest.cs)	(revision e343b677ebba0cff9ce37025214aa3109af39a1a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformerTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTransformerTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -38,7 +38,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             // Call
@@ -75,7 +75,7 @@
             // Setup
             var mocks = new MockRepository();
             var soilProfile = mocks.Stub<ISoilProfile>();
-            var macroStabilityInwardsSoilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var macroStabilityInwardsSoilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticSoilProfile = new StochasticSoilProfile(double.NaN, soilProfile);
@@ -99,7 +99,7 @@
 
             var mocks = new MockRepository();
             var soilProfile = mocks.Stub<ISoilProfile>();
-            var macroStabilityInwardsSoilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var macroStabilityInwardsSoilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var stochasticSoilProfile = new StochasticSoilProfile(random.NextDouble(), soilProfile);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -r1992d18b2bbb21978616eab455a1035cdf2ff397 -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs)	(revision 1992d18b2bbb21978616eab455a1035cdf2ff397)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -547,7 +547,7 @@
 
         /// <summary>
         /// Creates a collection of <see cref="MacroStabilityInwardsStochasticSoilProfile"/>
-        /// with all the supported <see cref="IMacroStabilityInwardsSoilProfile"/>.
+        /// with all the supported <see cref="IMacroStabilityInwardsSoilProfile{T}"/>.
         /// </summary>
         /// <returns>A collection of <see cref="MacroStabilityInwardsStochasticSoilProfile"/>.</returns>
         private static IList<MacroStabilityInwardsStochasticSoilProfile> CreateStochasticSoilProfiles()
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -61,7 +61,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             mocks.ReplayAll();
 
             var context = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r85b10b88eb31823c50ca052d34baacc6e006ad4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs)	(revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
@@ -82,7 +82,7 @@
             const string testName = "ttt";
 
             var mocks = new MockRepository();
-            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile>();
+            var soilProfile = mocks.Stub<IMacroStabilityInwardsSoilProfile<IMacroStabilityInwardsSoilLayer>>();
             soilProfile.Stub(sp => sp.Name).Return(testName);
             mocks.ReplayAll();