Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r875 -r921
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 921)
@@ -262,6 +262,7 @@
                 var inputLocation = inputLocations[i];
                 var waternetOptions = inputLocation.WaternetOptions;
                 location.Name = inputLocation.Name;
+                location.XSoilGeometry2DOrigin = inputLocation.XSoilGeometry2DOrigin;
                 location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
                 location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);
                 location.PolderLevel = waternetOptions.PolderLevel;
@@ -322,6 +323,7 @@
                 if (inputLocation.StabilityOptions != null)
                 {
                     location.MapForSoilGeometries2D = inputLocation.StabilityOptions.MapForSoilgeometries2D;
+                    location.SoildatabaseName = inputLocation.StabilityOptions.SoilDatabase;
                     location.StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType);
                     if (inputLocation.StabilityOptions.ForbiddenZoneFactorSpecified)
                     {
Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r875 -r921
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 921)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.Geotechnics.SurfaceLines;
@@ -46,6 +47,7 @@
             Input input = new Input();
             Dike dike = damProjectData.WaterBoard.Dikes[0];
 
+            input.WorkingDir = Directory.GetCurrentDirectory();
             TransferAnalysisSpecification(damProjectData, input);
             TransferStabilityParameters(damProjectData, input);
 
@@ -293,6 +295,8 @@
                 var location = dikeLocations[i];
                 var inputLocation = new DamEngine.Io.XmlInput.Location();
                 inputLocation.Name = location.Name;
+                inputLocation.XSoilGeometry2DOriginSpecified = true;
+                inputLocation.XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin;
 
                 inputLocation.SurfaceLineName = location.LocalXZSurfaceLine2.Name;
                 inputLocation.SegmentName = location.Segment.Name;
@@ -370,6 +374,7 @@
                 inputLocation.StabilityOptions = new LocationStabilityOptions
                 {
                     MapForSoilgeometries2D = location.MapForSoilGeometries2D,
+                    SoilDatabase = location.SoildatabaseName,
                     ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityZoneType),
                     ForbiddenZoneFactorSpecified = true,
                     ForbiddenZoneFactor = location.ForbiddenZoneFactor,