Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r578 -r580
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 580)
@@ -183,37 +183,39 @@
         }
 
         [Test]
-        [TestCase(SoilProfileType.ProfileType1D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D)]
-        [TestCase(SoilProfileType.ProfileType2D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D)]
-        public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, SegmentSoilGeometryProbabilitySoilGeometryType inputSoilGeometryType)
+        [TestCase(SoilProfileType.ProfileType1D, 0)]
+        [TestCase(SoilProfileType.ProfileType2D, 1)]
+        [TestCase(SoilProfileType.ProfileTypeStiFile, 2)]
+        public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType)
         {
             Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType));
         }
 
         [Test]
-        [TestCase(SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D, SoilProfileType.ProfileType1D)]
-        [TestCase(SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D, SoilProfileType.ProfileType2D)]
-        public void CanConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilGeometryType inputSoilGeometryType, SoilProfileType soilProfileType)
+        [TestCase(0, SoilProfileType.ProfileType1D)]
+        [TestCase(1, SoilProfileType.ProfileType2D)]
+        [TestCase(2, SoilProfileType.ProfileTypeStiFile)]
+        public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType)
         {
             Assert.AreEqual(soilProfileType, ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType));
         }
 
         [Test]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside)]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside)]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping)]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance, FailureMechanismSystemType.HorizontalBalance)]
-        public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, SegmentSoilGeometryProbabilityFailureMechanismSystemType inputFailureMechanismSystemType)
+        [TestCase(0, FailureMechanismSystemType.StabilityInside)]
+        [TestCase(1, FailureMechanismSystemType.StabilityOutside)]
+        [TestCase(2, FailureMechanismSystemType.Piping)]
+        [TestCase(3, FailureMechanismSystemType.HorizontalBalance)]
+        public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType)
         {
             Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
         }
 
         [Test]
-        [TestCase(FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside)]
-        [TestCase(FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside)]
-        [TestCase(FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping)]
-        [TestCase(FailureMechanismSystemType.HorizontalBalance, SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance)]
-        public void CanConvertToFailureMechanismSystemType(SegmentSoilGeometryProbabilityFailureMechanismSystemType inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
+        [TestCase(FailureMechanismSystemType.StabilityInside, 0)]
+        [TestCase(FailureMechanismSystemType.StabilityOutside, 1)]
+        [TestCase(FailureMechanismSystemType.Piping, 2)]
+        [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)]
+        public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
         {
             Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
         }
Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r572 -r580
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 572)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 580)
@@ -810,41 +810,41 @@
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class SegmentSoilGeometryProbability {
         
-        private string soilGeometryNameField;
+        private string soilProfileNameField;
         
-        private SegmentSoilGeometryProbabilitySoilGeometryType soilGeometryTypeField;
+        private int soilProfileTypeField;
         
-        private SegmentSoilGeometryProbabilityFailureMechanismSystemType failureMechanismSystemTypeField;
+        private int failureMechanismSystemTypeField;
         
         private bool failureMechanismSystemTypeFieldSpecified;
         
         private double probabilityField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string SoilGeometryName {
+        public string SoilProfileName {
             get {
-                return this.soilGeometryNameField;
+                return this.soilProfileNameField;
             }
             set {
-                this.soilGeometryNameField = value;
+                this.soilProfileNameField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public SegmentSoilGeometryProbabilitySoilGeometryType SoilGeometryType {
+        public int SoilProfileType {
             get {
-                return this.soilGeometryTypeField;
+                return this.soilProfileTypeField;
             }
             set {
-                this.soilGeometryTypeField = value;
+                this.soilProfileTypeField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public SegmentSoilGeometryProbabilityFailureMechanismSystemType FailureMechanismSystemType {
+        public int FailureMechanismSystemType {
             get {
                 return this.failureMechanismSystemTypeField;
             }
@@ -879,38 +879,6 @@
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
     [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public enum SegmentSoilGeometryProbabilitySoilGeometryType {
-        
-        /// <remarks/>
-        SoilGeometry1D,
-        
-        /// <remarks/>
-        SoilGeometry2D,
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public enum SegmentSoilGeometryProbabilityFailureMechanismSystemType {
-        
-        /// <remarks/>
-        StabilityInside,
-        
-        /// <remarks/>
-        StabilityOutside,
-        
-        /// <remarks/>
-        Piping,
-        
-        /// <remarks/>
-        HorizontalBalance,
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-    [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class Soil {
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml
===================================================================
diff -u -r578 -r580
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml	(.../InputFile.xml)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml	(.../InputFile.xml)	(revision 580)
@@ -71,30 +71,30 @@
   </Soils>
   <Segments>
     <Segment Name="Segment 0">
-      <SoilGeometryProbability SoilGeometryName="Profile2D 1" SoilProfile1DType="ProfileType2D" FailureMechanismSystemType="StabilityInside" Probability="0.003" />
+      <SoilGeometryProbability SoilProfileName="Profile2D 1" SoilProfileType="1" FailureMechanismSystemType="0" Probability="0.003" />
     </Segment>
     <Segment Name="Segment 1">
-      <SoilGeometryProbability SoilGeometryName="Profile1D 2" SoilProfile1DType="ProfileType1D" FailureMechanismSystemType="Piping" Probability="0.006" />
+      <SoilGeometryProbability SoilProfileName="Profile1D 2" SoilProfileType="0" FailureMechanismSystemType="2" Probability="0.006" />
     </Segment>
   </Segments>
-  <SoilProfile1Ds1D>
-    <SoilProfile1D1D Name="Profile1D 1" BottomLevel="-21.12">
+  <SoilProfiles1D>
+    <SoilProfile1D Name="Profile1D 1" BottomLevel="-21.12">
       <Layers1D>
         <Layer1D Name="Layer1" SoilName="Soil 0" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
         <Layer1D Name="Layer2" SoilName="Soil 1" TopLevel="-1" IsAquifer="false" WaterpressureInterpolationModel="0" />
         <Layer1D Name="Layer3" SoilName="Soil 2" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="1" />
       </Layers1D>
-    </SoilProfile1D1D>
-    <SoilProfile1D1D Name="Profile1D 2" BottomLevel="-42.24">
+    </SoilProfile1D>
+    <SoilProfile1D Name="Profile1D 2" BottomLevel="-42.24">
       <Layers1D>
         <Layer1D Name="Layer1" SoilName="Soil 0" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
         <Layer1D Name="Layer2" SoilName="Soil 1" TopLevel="-1" IsAquifer="false" WaterpressureInterpolationModel="0" />
         <Layer1D Name="Layer3" SoilName="Soil 2" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="1" />
       </Layers1D>
-    </SoilProfile1D1D>
-  </SoilProfile1Ds1D>
-  <SoilProfile1Ds2D>
-    <SoilProfile1D2D Name="Profile2D 1">
+    </SoilProfile1D>
+  </SoilProfiles1D>
+  <SoilProfiles2D>
+    <SoilProfile2D Name="Profile2D 1">
       <Layers2D>
         <Layer2D SoilName="Soil 0" IsAquifer="false" WaterpressureInterpolationModel="0">
           <Surface>
@@ -143,8 +143,8 @@
         <PreconsolidationStress StressValue="3.33" Name="Precon 1" X="12.3" Z="-0.3" />
         <PreconsolidationStress StressValue="6.66" Name="Precon 2" X="24.6" Z="-0.6" />
       </PreconsolidationStresses>
-    </SoilProfile1D2D>
-    <SoilProfile1D2D Name="Profile2D 2">
+    </SoilProfile2D>
+    <SoilProfile2D Name="Profile2D 2">
       <Layers2D>
         <Layer2D SoilName="Soil 0" IsAquifer="false" WaterpressureInterpolationModel="0">
           <Surface>
@@ -193,6 +193,6 @@
         <PreconsolidationStress StressValue="6.66" Name="Precon 1" X="24.6" Z="-0.6" />
         <PreconsolidationStress StressValue="13.32" Name="Precon 2" X="49.2" Z="-1.2" />
       </PreconsolidationStresses>
-    </SoilProfile1D2D>
-  </SoilProfile1Ds2D>
+    </SoilProfile2D>
+  </SoilProfiles2D>
 </Input>
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r578 -r580
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 580)
@@ -374,20 +374,26 @@
                 {
                     soilGeometryProbability.SegmentFailureMechanismType = null;
                 }
-                switch (inputSoilGeometryProbability.SoilGeometryType)
+                soilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryProbability.SoilProfileType);
+                switch (soilGeometryProbability.SoilProfileType)
                 {
-                    case SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D:
+                    case SoilProfileType.ProfileType1D:
                     {
-                        soilGeometryProbability.SoilProfile1DName = inputSoilGeometryProbability.SoilGeometryName;
+                        soilGeometryProbability.SoilProfile1DName = inputSoilGeometryProbability.SoilProfileName;
                         break;
                     }
-                    case SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D:
+                    case SoilProfileType.ProfileType2D:
                     {
-                        soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilGeometryName;
+                        soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilProfileName;
                         break;
                     }
+                    case SoilProfileType.ProfileTypeStiFile:
+                        {
+                            soilGeometryProbability.StiFileName = inputSoilGeometryProbability.SoilProfileName;
+                            break;
+                        }
                 }
-                soilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryProbability.SoilGeometryType);
+                
                 segment.SoilProfileProbabilities.Add(soilGeometryProbability);
             }
         }
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r578 -r580
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 580)
@@ -388,15 +388,26 @@
                     {
                         inputSoilGeometryProbability.FailureMechanismSystemTypeSpecified = false;
                     }
-                    if (soilGeometryProbability.SoilProfileType == SoilProfileType.ProfileType1D)
+                    inputSoilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryProbability.SoilProfileType);
+                    switch (soilGeometryProbability.SoilProfileType)
                     {
-                        inputSoilGeometryProbability.SoilGeometryName = soilGeometryProbability.SoilProfile1DName;
+                        case SoilProfileType.ProfileType1D:
+                        {
+                            inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile1DName;
+                            break;
+                        }
+                        case SoilProfileType.ProfileType2D:
+                        {
+                            inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile2DName;
+                            break;
+                        }
+                        case SoilProfileType.ProfileTypeStiFile:
+                        {
+                            inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.StiFileName;
+                            break;
+                        }
                     }
-                    else
-                    {
-                        inputSoilGeometryProbability.SoilGeometryName = soilGeometryProbability.SoilProfile2DName;
-                    }
-                    inputSoilGeometryProbability.SoilGeometryType = ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryProbability.SoilProfileType);
+
                     inputSegment.SoilGeometryProbability[i] = inputSoilGeometryProbability;
                 }
             }
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r578 -r580
--- dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 580)
@@ -292,12 +292,13 @@
         /// </summary>
         /// <param name="soilProfileType">Type of the soil geometry.</param>
         /// <returns></returns>
-        public static SegmentSoilGeometryProbabilitySoilGeometryType ConvertToInputSoilGeometryType(SoilProfileType soilProfileType)
+        public static int ConvertToInputSoilGeometryType(SoilProfileType soilProfileType)
         {
-            var translationTable = new Dictionary<SoilProfileType, SegmentSoilGeometryProbabilitySoilGeometryType>()
+            var translationTable = new Dictionary<SoilProfileType, int>()
                                                {
-                                                   {SoilProfileType.ProfileType1D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D},
-                                                   {SoilProfileType.ProfileType2D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D}
+                                                   {SoilProfileType.ProfileType1D, 0},
+                                                   {SoilProfileType.ProfileType2D, 1},
+                                                   {SoilProfileType.ProfileTypeStiFile, 2}
                                                };
             return translationTable[soilProfileType];
         }
@@ -307,12 +308,13 @@
         /// </summary>
         /// <param name="soilGeometryType">Type of the soil geometry.</param>
         /// <returns></returns>
-        public static SoilProfileType ConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilGeometryType soilGeometryType)
+        public static SoilProfileType ConvertToSoilGeometryType(int soilGeometryType)
         {
-            var translationTable = new Dictionary<SegmentSoilGeometryProbabilitySoilGeometryType, SoilProfileType>()
+            var translationTable = new Dictionary<int, SoilProfileType>()
                                                {
-                                                   {SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D, SoilProfileType.ProfileType1D},
-                                                   {SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D, SoilProfileType.ProfileType2D}
+                                                   {0, SoilProfileType.ProfileType1D},
+                                                   {1, SoilProfileType.ProfileType2D},
+                                                   {2, SoilProfileType.ProfileTypeStiFile}
                                                };
             return translationTable[soilGeometryType];
         }
@@ -322,14 +324,14 @@
         /// </summary>
         /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
         /// <returns></returns>
-        public static SegmentSoilGeometryProbabilityFailureMechanismSystemType ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType)
+        public static int ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType)
         {
-            var translationTable = new Dictionary<FailureMechanismSystemType, SegmentSoilGeometryProbabilityFailureMechanismSystemType>()
+            var translationTable = new Dictionary<FailureMechanismSystemType, int>()
                                                {
-                                                   {FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside},
-                                                   {FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside},
-                                                   {FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping},
-                                                   {FailureMechanismSystemType.HorizontalBalance, SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance}
+                                                   {FailureMechanismSystemType.StabilityInside, 0},
+                                                   {FailureMechanismSystemType.StabilityOutside, 1},
+                                                   {FailureMechanismSystemType.Piping, 2},
+                                                   {FailureMechanismSystemType.HorizontalBalance, 3}
                                                };
             return translationTable[segmentFailureMechanismType];
         }
@@ -339,14 +341,14 @@
         /// </summary>
         /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
         /// <returns></returns>
-        public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(SegmentSoilGeometryProbabilityFailureMechanismSystemType failureMechanismSystemType)
+        public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(int failureMechanismSystemType)
         {
-            var translationTable = new Dictionary<SegmentSoilGeometryProbabilityFailureMechanismSystemType, FailureMechanismSystemType>()
+            var translationTable = new Dictionary<int, FailureMechanismSystemType>()
                                                {
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside},
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside},
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping},
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance, FailureMechanismSystemType.HorizontalBalance}
+                                                   {0, FailureMechanismSystemType.StabilityInside},
+                                                   {1, FailureMechanismSystemType.StabilityOutside},
+                                                   {2, FailureMechanismSystemType.Piping},
+                                                   {3, FailureMechanismSystemType.HorizontalBalance}
                                                };
             return translationTable[failureMechanismSystemType];
         }