Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/libmmd.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.Geo.Common.Geometry.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Interface.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Calculation.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SearchAlgorithms.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r3078 -r3362
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 3078)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 3362)
@@ -48,9 +48,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.CSharpWrapper.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.MacroStability.Standard, Version=20.2.0.9856, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Deltares.Geo.Common.Standard">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Standard.dll</HintPath>
+      <HintPath>..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.Geo.Common.Standard.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.SearchAlgorithms, Version=19.1.1.8711, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SoilStress.Data.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r3313 -r3362
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 3313)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 3362)
@@ -39,7 +39,7 @@
 using Deltares.MacroStability.CSharpWrapper;
 using Deltares.MacroStability.CSharpWrapper.Input;
 using Deltares.MacroStability.CSharpWrapper.Output;
-using Deltares.MacroStability.Standard;
+using Deltares.Geo.Common.Standard;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
 using GeometryPoint = Deltares.DamEngine.Data.Geometry.GeometryPoint;
 using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage;
@@ -214,7 +214,7 @@
             messages = new List<LogMessage>();
             try
             {
-                var result = Deltares.MacroStability.CSharpWrapper.Validator.Validate((MacroStabilityInput)macroStabilityKernelDataInput.Input);
+                var result = new MacroStability.CSharpWrapper.Validator(macroStabilityKernelDataInput.Input).Validate();
                 if (result.IsValid)
                 {
                     return 0;
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.CSharpWrapper.pdb
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Kernel.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Preprocessing.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/feedbackDLL.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.CSharpWrapper.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Probabilistic.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.CSharpWrapper.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Data.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.CSharpWrapper.pdb
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SoilStress.Calculation.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/libifcoremd.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Io.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/SimpleZfuncInDll.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.Interface.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.WaternetCreator.Creator.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/probabilisticLib.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.Geo.Common.Standard.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/libiomp5md.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r3307 -r3362
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3307)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3362)
@@ -219,7 +219,7 @@
             {
 
                 var kernelCharPoint = new SurfaceLineCharacteristicPoint();
-                kernelCharPoint.CharacteristicPoint =
+                kernelCharPoint.CharacteristicPointType =
                     ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(
                         damCharPoint.CharacteristicPointType);
                 kernelCharPoint.GeometryPoint = new KernelPoint2D(damCharPoint.X, damCharPoint.Z);
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.Io.dll
===================================================================
diff -u -r3220 -r3362
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
===================================================================
diff -u -r3242 -r3362
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs	(.../FillEngineFromMacroStabilityWrapperInput.cs)	(revision 3242)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs	(.../FillEngineFromMacroStabilityWrapperInput.cs)	(revision 3362)
@@ -223,7 +223,7 @@
             {
                 var damCharPoint = new CharacteristicPoint()
                 {
-                    CharacteristicPointType = ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharPoint.CharacteristicPoint),
+                    CharacteristicPointType = ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharPoint.CharacteristicPointType),
                     GeometryPoint = new GeometryPoint()
                     {
                         X = kernelCharPoint.GeometryPoint.X,