Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r3249 -r3369
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 3249)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 3369)
@@ -199,7 +199,7 @@
             for (int i = 0; i < soilList.Soils.Count; i++)
             {
                 // All even indeces are set to true, all odd indices are set to false
-                soilList.AquiferDictionary.Add(soilList.Soils[i], (i % 2) == 0);
+                soilList.AquiferDictionary.Add(soilList.Soils[i].Name, (i % 2) == 0);
             }
         }
 
Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs
===================================================================
diff -u -r3249 -r3369
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs	(.../Geometry2DTo1DConverter.cs)	(revision 3249)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs	(.../Geometry2DTo1DConverter.cs)	(revision 3369)
@@ -169,9 +169,9 @@
                 {
                     throw new Geometry2DTo1DConverterException(String.Format("Soil material '{0}' belonging to layer '{1}' not available in soillist", layer.SoilName, layer.Name));
                 }
-                if (SoilList.AquiferDictionary.ContainsKey(layer.Soil))
+                if (SoilList.AquiferDictionary.ContainsKey(layer.Soil.Name))
                 {
-                    layer.IsAquifer = SoilList.AquiferDictionary[layer.Soil];
+                    layer.IsAquifer = SoilList.AquiferDictionary[layer.Soil.Name];
                 }
             }
             var aquifers = soilProfile.GetAquiferLayers();
Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs
===================================================================
diff -u -r3249 -r3369
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs	(.../SoilList.cs)	(revision 3249)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs	(.../SoilList.cs)	(revision 3369)
@@ -31,7 +31,7 @@
     /// </summary>
     public class SoilList
     {
-        private Dictionary<Soil, bool> aquiferDictionary = new Dictionary<Soil, bool>();
+        private Dictionary<string, bool> aquiferDictionary = new Dictionary<string, bool>();
         private List<Soil> soils;
 
         public SoilList()
@@ -66,7 +66,7 @@
         /// <value>
         /// The aquifer dictionary.
         /// </value>
-        public Dictionary<Soil, bool> AquiferDictionary
+        public Dictionary<string, bool> AquiferDictionary
         {
             get
             {
@@ -120,9 +120,9 @@
         public void Remove(Soil soil)
         {
             Soils.Remove(soil);
-            if (aquiferDictionary.ContainsKey(soil))
+            if (aquiferDictionary.ContainsKey(soil.Name))
             {
-                aquiferDictionary.Remove(soil);
+                aquiferDictionary.Remove(soil.Name);
             }
         }
 
Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r3249 -r3369
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 3249)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 3369)
@@ -217,16 +217,16 @@
             }
         }
 
-        private static void TransferAquiferSoils(Dictionary<Data.Geotechnics.Soil, bool> aquiferDictionary, Input input)
+        private static void TransferAquiferSoils(Dictionary<string, bool> aquiferDictionary, Input input)
         {
             InputAquiferSoil[] aquiferSoils;
             if (aquiferDictionary != null && aquiferDictionary.Count > 0)
             {
                 aquiferSoils = new InputAquiferSoil[aquiferDictionary.Count];
                 int soilIndex = 0;
-                foreach (KeyValuePair<Data.Geotechnics.Soil, bool> keyValuePair in aquiferDictionary)
+                foreach (KeyValuePair<string, bool> keyValuePair in aquiferDictionary)
                 {
-                    aquiferSoils[soilIndex] = new InputAquiferSoil() { Soilname = keyValuePair.Key.Name, IsAquifer = keyValuePair.Value };
+                    aquiferSoils[soilIndex] = new InputAquiferSoil() { Soilname = keyValuePair.Key, IsAquifer = keyValuePair.Value };
                     soilIndex++;
                 }
             }
Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs
===================================================================
diff -u -r3249 -r3369
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs	(.../DamMacroStabilityTestHelper.cs)	(revision 3249)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs	(.../DamMacroStabilityTestHelper.cs)	(revision 3369)
@@ -153,22 +153,21 @@
                 BelowPhreaticLevel = 20
             };
             soilList.Soils.Add(s15);
-            soilList.AquiferDictionary = new Dictionary<Soil, bool>();
-            soilList.AquiferDictionary.Add(s1, false);
-            soilList.AquiferDictionary.Add(s2, false);
-            soilList.AquiferDictionary.Add(s3, true);
-            soilList.AquiferDictionary.Add(s4, false);
-            soilList.AquiferDictionary.Add(s5, true);
-            soilList.AquiferDictionary.Add(s6, false);
-            soilList.AquiferDictionary.Add(s7, false);
-            soilList.AquiferDictionary.Add(s8, false);
-            soilList.AquiferDictionary.Add(s9, false);
-            soilList.AquiferDictionary.Add(s10, false);
-            soilList.AquiferDictionary.Add(s11, false);
-            soilList.AquiferDictionary.Add(s12, false);
-            soilList.AquiferDictionary.Add(s13, true);
-            soilList.AquiferDictionary.Add(s14, false);
-            soilList.AquiferDictionary.Add(s15, false);
+            soilList.AquiferDictionary.Add(s1.Name, false);
+            soilList.AquiferDictionary.Add(s2.Name, false);
+            soilList.AquiferDictionary.Add(s3.Name, true);
+            soilList.AquiferDictionary.Add(s4.Name, false);
+            soilList.AquiferDictionary.Add(s5.Name, true);
+            soilList.AquiferDictionary.Add(s6.Name, false);
+            soilList.AquiferDictionary.Add(s7.Name, false);
+            soilList.AquiferDictionary.Add(s8.Name, false);
+            soilList.AquiferDictionary.Add(s9.Name, false);
+            soilList.AquiferDictionary.Add(s10.Name, false);
+            soilList.AquiferDictionary.Add(s11.Name, false);
+            soilList.AquiferDictionary.Add(s12.Name, false);
+            soilList.AquiferDictionary.Add(s13.Name, true);
+            soilList.AquiferDictionary.Add(s14.Name, false);
+            soilList.AquiferDictionary.Add(s15.Name, false);
             return soilList;
         }
 
Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r3332 -r3369
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 3332)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 3369)
@@ -237,21 +237,21 @@
             List<LogMessage> validationMessages = new List<LogMessage>();
             if (inputAquiferSoils != null)
             {
-                soilList.AquiferDictionary = new Dictionary<Data.Geotechnics.Soil, bool>();
+                soilList.AquiferDictionary.Clear();
                 foreach (InputAquiferSoil aquiferSoil in inputAquiferSoils)
                 {
                     var soil = soilList.GetSoilByName(aquiferSoil.Soilname);
-                    if (!soilList.AquiferDictionary.ContainsKey(soil))
+                    if (!soilList.AquiferDictionary.ContainsKey(soil.Name))
                     {
-                        soilList.AquiferDictionary.Add(soil, aquiferSoil.IsAquifer);
+                        soilList.AquiferDictionary.Add(soil.Name, aquiferSoil.IsAquifer);
                     }
                     else
                     {
                         // If a soil is (wrongly) in the list more than once, then prefer aquifer true. 
                         if (aquiferSoil.IsAquifer)
                         {
                             validationMessages.Add(new LogMessage(LogMessageType.Warning, aquiferSoil, string.Format(Resources.DoubleAquiferSoil, aquiferSoil.Soilname)));
-                            soilList.AquiferDictionary[soil] = true;
+                            soilList.AquiferDictionary[soil.Name] = true;
                         }
                     }
                 }