Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs
===================================================================
diff -u -r6264 -r6387
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs	(.../MacroStabilityOutputItem.cs)	(revision 6264)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs	(.../MacroStabilityOutputItem.cs)	(revision 6387)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Standard.Calculation;
@@ -120,6 +121,7 @@
 
     /// <summary>
     /// Gets or sets the Bishop calculation circle.
+    /// TODO: This property should be removed when the CSharpWrapper is not used anymore
     /// </summary>
     /// <value>
     /// The bishop calculation circle.
@@ -128,9 +130,26 @@
 
     /// <summary>
     /// Gets or sets the Uplift Van calculation grid.
+    /// TODO: This property should be removed when the CSharpWrapper is not used anymore
     /// </summary>
     /// <value>
     /// The Uplift Van calculation grid.
     /// </value>
-    public UpliftVanCalculationGrid UpliftVanCalculationGrid { get; set; }
+    public MacroStability.CSharpWrapper.UpliftVanCalculationGrid UpliftVanCalculationGrid { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Bishop calculation circle.
+    /// </summary>
+    /// <value>
+    /// The bishop calculation circle.
+    /// </value>
+    public BishopCalculationGrid InputBishopCalculationCircle { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Uplift Van calculation grid.
+    /// </summary>
+    /// <value>
+    /// The Uplift Van calculation grid.
+    /// </value>
+    public MacroStabilityCommon.UpliftVanCalculationGrid InputUpliftVanCalculationGrid { get; set; }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityKernelOutput.cs
===================================================================
diff -u -r6379 -r6387
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityKernelOutput.cs	(.../FillEngineFromMacroStabilityKernelOutput.cs)	(revision 6379)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityKernelOutput.cs	(.../FillEngineFromMacroStabilityKernelOutput.cs)	(revision 6387)
@@ -48,5 +48,8 @@
         macroStabilityOutputItem.CalculationResult = stabilityOutput.Succeeded ? CalculationResult.Succeeded : CalculationResult.RunFailed;
         macroStabilityOutputItem.SafetyFactor = stabilityOutput.SafetyFactor;
         macroStabilityOutputItem.StabilityModelType = OutputConversionHelper.ConvertToStabilityModelType(stabilityOutput.ModelOption);
+        // macroStabilityOutputItem.ActiveCenterPoint = new Point2D(stabilityOutput.BishopCalculatedSlipPlanes[0].Center.X, stabilityOutput.BishopCalculatedSlipPlanes[0].Center.Z);
+        // macroStabilityOutputItem.BishopCalculationCircle = new BishopCalculationGrid();
+        // macroStabilityOutputItem.UpliftVanCalculationGrid = new UpliftVanCalculationGrid();
     }
 }
\ No newline at end of file