Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs
===================================================================
diff -u -r6391 -r6399
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs	(.../MacroStabilityOutputItem.cs)	(revision 6391)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs	(.../MacroStabilityOutputItem.cs)	(revision 6399)
@@ -121,21 +121,21 @@
 
     /// <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.
     /// </value>
-//    public BishopCalculationCircle BishopCalculationCircle { get; set; }
+    // TODO: Remove this property to make this class independent of the CSharpWrapper
+    public BishopCalculationCircle BishopCalculationCircle { get; set; }
 
     /// <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 MacroStability.CSharpWrapper.UpliftVanCalculationGrid UpliftVanCalculationGrid { get; set; }
+    // TODO: Remove this property to make this class independent of the CSharpWrapper
+    public MacroStability.CSharpWrapper.UpliftVanCalculationGrid UpliftVanCalculationGrid { get; set; }
 
     /// <summary>
     /// Gets or sets the Bishop calculation circle.
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs
===================================================================
diff -u -r6391 -r6399
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 6391)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 6399)
@@ -58,9 +58,10 @@
             {
                 CalculationResult = ConversionHelper.ConvertToDamResultType(kernelOutput.ResultType),
                 SafetyFactor = kernelOutput.StabilityOutput.SafetyFactor,
-                StabilityModelType = ConversionHelper.ConvertToMStabModelType(kernelOutput.StabilityOutput.ModelOptionType)
-                // BishopCalculationCircle = new MacroStability.CSharpWrapper.BishopCalculationCircle(),
-                // UpliftVanCalculationGrid = new MacroStability.CSharpWrapper.UpliftVanCalculationGrid()
+                StabilityModelType = ConversionHelper.ConvertToMStabModelType(kernelOutput.StabilityOutput.ModelOptionType),
+                // TODO: Remove 2 lines below to make outputItem independent of the CSharpWrapper
+                BishopCalculationCircle = new BishopCalculationCircle(),
+                UpliftVanCalculationGrid = new MacroStability.CSharpWrapper.UpliftVanCalculationGrid()
             };
 
             if (outputItem.StabilityModelType == StabilityModelType.Bishop)
@@ -80,15 +81,17 @@
                 if (outputItem.StabilityModelType == StabilityModelType.Bishop || outputItem.StabilityModelType == StabilityModelType.BishopUpliftVan)
                 {
                     var bishopPreprocessingOutput = (BishopPreprocessingOutput) kernelOutput.PreprocessingOutputBase;
-                    // outputItem.BishopCalculationCircle = bishopPreprocessingOutput.BishopCalculationCircle;
-                    outputItem.InputBishopCalculationGrid = CSharpWrapperConverters.CreateEngineBishopCalculationGrid(bishopPreprocessingOutput.BishopCalculationCircle);
+                    outputItem.BishopCalculationCircle = bishopPreprocessingOutput.BishopCalculationCircle;
+                    // TODO: Replace above with the following line to make outputItem independent of the CSharpWrapper
+                    // outputItem.InputBishopCalculationGrid = CSharpWrapperConverters.CreateEngineBishopCalculationGrid(bishopPreprocessingOutput.BishopCalculationCircle);
                 }
 
                 if (outputItem.StabilityModelType == StabilityModelType.UpliftVan || outputItem.StabilityModelType == StabilityModelType.BishopUpliftVan)
                 {
                     var upliftVanPreprocessingOutput = (UpliftVanPreprocessingOutput) kernelOutput.PreprocessingOutputBase;
-                    // outputItem.UpliftVanCalculationGrid = upliftVanPreprocessingOutput.UpliftVanCalculationGrid;
-                    outputItem.InputUpliftVanCalculationGrid = CSharpWrapperConverters.CreateEngineUpliftVanCalculationGrid(upliftVanPreprocessingOutput.UpliftVanCalculationGrid);
+                    outputItem.UpliftVanCalculationGrid = upliftVanPreprocessingOutput.UpliftVanCalculationGrid;
+                    // TODO: Replace above with the following line to make outputItem independent of the CSharpWrapper
+                    // outputItem.InputUpliftVanCalculationGrid = CSharpWrapperConverters.CreateEngineUpliftVanCalculationGrid(upliftVanPreprocessingOutput.UpliftVanCalculationGrid);
                 }
             }