Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs	(.../UpliftVanCalculatorInput.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs	(.../UpliftVanCalculatorInput.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -46,14 +46,11 @@
             SurfaceLine = properties.SurfaceLine;
             SoilProfile = properties.SoilProfile;
             DrainageConstruction = properties.DrainageConstruction;
+            PhreaticLineOffsets = properties.PhreaticLineOffsets;
             WaterLevelRiverAverage = properties.WaterLevelRiverAverage;
             WaterLevelPolder = properties.WaterLevelPolder;
             MinimumLevelPhreaticLineAtDikeTopRiver = properties.MinimumLevelPhreaticLineAtDikeTopRiver;
             MinimumLevelPhreaticLineAtDikeTopPolder = properties.MinimumLevelPhreaticLineAtDikeTopPolder;
-            PhreaticLineOffsetBelowDikeTopAtRiver = properties.PhreaticLineOffsetBelowDikeTopAtRiver;
-            PhreaticLineOffsetBelowDikeTopAtPolder = properties.PhreaticLineOffsetBelowDikeTopAtPolder;
-            PhreaticLineOffsetBelowShoulderBaseInside = properties.PhreaticLineOffsetBelowShoulderBaseInside;
-            PhreaticLineOffsetBelowDikeToeAtPolder = properties.PhreaticLineOffsetBelowDikeToeAtPolder;
             LeakageLengthOutwardsPhreaticLine3 = properties.LeakageLengthOutwardsPhreaticLine3;
             LeakageLengthInwardsPhreaticLine3 = properties.LeakageLengthInwardsPhreaticLine3;
             LeakageLengthOutwardsPhreaticLine4 = properties.LeakageLengthOutwardsPhreaticLine4;
@@ -62,7 +59,6 @@
             PiezometricHeadPhreaticLine2Inwards = properties.PiezometricHeadPhreaticLine2Inwards;
             PenetrationLength = properties.PenetrationLength;
             AdjustPhreaticLine3And4ForUplift = properties.AdjustPhreaticLine3And4ForUplift;
-            UseDefaultOffsets = properties.UseDefaultOffsets;
             DikeSoilScenario = properties.DikeSoilScenario;
             MoveGrid = properties.MoveGrid;
             MaximumSliceWidth = properties.MaximumSliceWidth;
@@ -93,10 +89,6 @@
                 WaterLevelPolder = double.NaN;
                 MinimumLevelPhreaticLineAtDikeTopRiver = double.NaN;
                 MinimumLevelPhreaticLineAtDikeTopPolder = double.NaN;
-                PhreaticLineOffsetBelowDikeTopAtRiver = double.NaN;
-                PhreaticLineOffsetBelowDikeTopAtPolder = double.NaN;
-                PhreaticLineOffsetBelowShoulderBaseInside = double.NaN;
-                PhreaticLineOffsetBelowDikeToeAtPolder = double.NaN;
                 LeakageLengthOutwardsPhreaticLine3 = double.NaN;
                 LeakageLengthInwardsPhreaticLine3 = double.NaN;
                 LeakageLengthOutwardsPhreaticLine4 = double.NaN;
@@ -136,6 +128,11 @@
             public UpliftVanDrainageConstruction DrainageConstruction { internal get; set; }
 
             /// <summary>
+            /// Gets or sets the phreatic line offsets.
+            /// </summary>
+            public UpliftVanPhreaticLineOffsets PhreaticLineOffsets { internal get; set; }
+
+            /// <summary>
             /// Gets or sets the dike soil scenario.
             /// </summary>
             public MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { internal get; set; }
@@ -165,35 +162,6 @@
             public double MinimumLevelPhreaticLineAtDikeTopPolder { internal get; set; }
 
             /// <summary>
-            /// Gets or sets whether the default offsets should be used.
-            /// </summary>
-            public bool UseDefaultOffsets { internal get; set; }
-
-            /// <summary>
-            /// Gets or sets the offset of the phreatic line below dike top at river.
-            /// [m]
-            /// </summary>
-            public double PhreaticLineOffsetBelowDikeTopAtRiver { internal get; set; }
-
-            /// <summary>
-            /// Gets or sets the offset of the phreatic line below dike top at polder.
-            /// [m]
-            /// </summary>
-            public double PhreaticLineOffsetBelowDikeTopAtPolder { internal get; set; }
-
-            /// <summary>
-            /// Gets or sets the offset of the phreatic line below shoulder base inside.
-            /// [m]
-            /// </summary>
-            public double PhreaticLineOffsetBelowShoulderBaseInside { internal get; set; }
-
-            /// <summary>
-            /// Gets or sets the offset of the phreatic line below dike toe at polder.
-            /// [m]
-            /// </summary>
-            public double PhreaticLineOffsetBelowDikeToeAtPolder { internal get; set; }
-
-            /// <summary>
             /// Gets or sets whether phreatic line 3 and 4 should be adjusted for Uplift.
             /// </summary>
             public bool AdjustPhreaticLine3And4ForUplift { internal get; set; }
@@ -332,6 +300,11 @@
         public UpliftVanDrainageConstruction DrainageConstruction { get; }
 
         /// <summary>
+        /// Gets the phreatic line offsets.
+        /// </summary>
+        public UpliftVanPhreaticLineOffsets PhreaticLineOffsets { get; }
+
+        /// <summary>
         /// Gets the dike soil scenario.
         /// </summary>
         public MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { get; }
@@ -361,35 +334,6 @@
         public double MinimumLevelPhreaticLineAtDikeTopPolder { get; }
 
         /// <summary>
-        /// Gets whether the default offsets should be used.
-        /// </summary>
-        public bool UseDefaultOffsets { get; }
-
-        /// <summary>
-        /// Gets the offset of the phreatic line below dike top at river.
-        /// [m]
-        /// </summary>
-        public double PhreaticLineOffsetBelowDikeTopAtRiver { get; }
-
-        /// <summary>
-        /// Gets the offset of the phreatic line below dike top at polder.
-        /// [m]
-        /// </summary>
-        public double PhreaticLineOffsetBelowDikeTopAtPolder { get; }
-
-        /// <summary>
-        /// Gets the offset of the phreatic line below shoulder base inside.
-        /// [m]
-        /// </summary>
-        public double PhreaticLineOffsetBelowShoulderBaseInside { get; }
-
-        /// <summary>
-        /// Gets the offset of the phreatic line below dike toe at polder.
-        /// [m]
-        /// </summary>
-        public double PhreaticLineOffsetBelowDikeToeAtPolder { get; }
-
-        /// <summary>
         /// Gets whether phreatic line 3 and 4 should be adjusted for Uplift.
         /// </summary>
         public bool AdjustPhreaticLine3And4ForUplift { get; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanPhreaticLineOffsets.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanPhreaticLineOffsets.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanPhreaticLineOffsets.cs	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -0,0 +1,91 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input
+{
+    /// <summary>
+    /// Phreatic line offset values that are used to perform a calculation.
+    /// </summary>
+    public class UpliftVanPhreaticLineOffsets
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="UpliftVanPhreaticLineOffsets"/>.
+        /// </summary>
+        /// <remarks><see cref="UseDefaults"/> is set to <c>true</c>; <see cref="BelowDikeTopAtRiver"/>,
+        /// <see cref="BelowDikeTopAtPolder"/>, <see cref="BelowDikeToeAtPolder"/>
+        /// and <see cref="BelowShoulderBaseInside"/> are set to <see cref="double.NaN"/>.</remarks>
+        public UpliftVanPhreaticLineOffsets()
+        {
+            UseDefaults = true;
+            BelowDikeTopAtRiver = double.NaN;
+            BelowDikeTopAtPolder = double.NaN;
+            BelowDikeToeAtPolder = double.NaN;
+            BelowShoulderBaseInside = double.NaN;
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="UpliftVanPhreaticLineOffsets"/>.
+        /// </summary>
+        /// <param name="belowDikeTopAtRiver">The offset of the phreatic line below dike top at river.</param>
+        /// <param name="belowDikeTopAtPolder">The offset of the phreatic line below dike top at polder.</param>
+        /// <param name="belowDikeToeAtPolder">The offset of the phreatic line below dike toe at polder.</param>
+        /// <param name="belowShoulderBaseInside">The offset of the phreatic line below shoulder base inside.</param>
+        /// <remarks><see cref="UseDefaults"/> is set to <c>false</c>.</remarks>
+        public UpliftVanPhreaticLineOffsets(double belowDikeTopAtRiver, double belowDikeTopAtPolder,
+                                            double belowDikeToeAtPolder, double belowShoulderBaseInside)
+        {
+            UseDefaults = false;
+            BelowDikeTopAtRiver = belowDikeTopAtRiver;
+            BelowDikeTopAtPolder = belowDikeTopAtPolder;
+            BelowDikeToeAtPolder = belowDikeToeAtPolder;
+            BelowShoulderBaseInside = belowShoulderBaseInside;
+        }
+
+        /// <summary>
+        /// Gets whether the default offsets should be used.
+        /// </summary>
+        public bool UseDefaults { get; }
+
+        /// <summary>
+        /// Gets the offset of the phreatic line below dike top at river.
+        /// [m]
+        /// </summary>
+        public double BelowDikeTopAtRiver { get; }
+
+        /// <summary>
+        /// Gets the offset of the phreatic line below dike top at polder.
+        /// [m]
+        /// </summary>
+        public double BelowDikeTopAtPolder { get; }
+
+        /// <summary>
+        /// Gets the offset of the phreatic line below dike toe at polder.
+        /// [m]
+        /// </summary>
+        public double BelowDikeToeAtPolder { get; }
+
+        /// <summary>
+        /// Gets the offset of the phreatic line below shoulder base inside.
+        /// [m]
+        /// </summary>
+        public double BelowShoulderBaseInside { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreator.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreator.cs	(.../StabilityLocationCreator.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreator.cs	(.../StabilityLocationCreator.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -65,11 +65,11 @@
                 ZCoordMiddleDrainageConstruction = input.DrainageConstruction.ZCoordinate,
                 MinimumLevelPhreaticLineAtDikeTopRiver = input.MinimumLevelPhreaticLineAtDikeTopRiver,
                 MinimumLevelPhreaticLineAtDikeTopPolder = input.MinimumLevelPhreaticLineAtDikeTopPolder,
-                UseDefaultOffsets = input.UseDefaultOffsets,
-                PlLineOffsetBelowPointBRingtoetsWti2017 = input.PhreaticLineOffsetBelowDikeTopAtRiver,
-                PlLineOffsetBelowDikeTopAtPolder = input.PhreaticLineOffsetBelowDikeTopAtPolder,
-                PlLineOffsetBelowShoulderBaseInside = input.PhreaticLineOffsetBelowShoulderBaseInside,
-                PlLineOffsetBelowDikeToeAtPolder = input.PhreaticLineOffsetBelowDikeToeAtPolder,
+                UseDefaultOffsets = input.PhreaticLineOffsets.UseDefaults,
+                PlLineOffsetBelowPointBRingtoetsWti2017 = input.PhreaticLineOffsets.BelowDikeTopAtRiver,
+                PlLineOffsetBelowDikeTopAtPolder = input.PhreaticLineOffsets.BelowDikeTopAtPolder,
+                PlLineOffsetBelowShoulderBaseInside = input.PhreaticLineOffsets.BelowShoulderBaseInside,
+                PlLineOffsetBelowDikeToeAtPolder = input.PhreaticLineOffsets.BelowDikeToeAtPolder,
                 AdjustPl3And4ForUplift = input.AdjustPhreaticLine3And4ForUplift,
                 LeakageLengthOutwardsPl3 = input.LeakageLengthOutwardsPhreaticLine3,
                 LeakageLengthInwardsPl3 = input.LeakageLengthInwardsPhreaticLine3,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -45,6 +45,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanDrainageConstruction.cs" />
+    <Compile Include="Calculators\UpliftVan\Input\UpliftVanPhreaticLineOffsets.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanPreconsolidationStress.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanShearStrengthModel.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanSoilLayer.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanPhreaticLineOffsetsConverter.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanPhreaticLineOffsetsConverter.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanPhreaticLineOffsetsConverter.cs	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+
+namespace Ringtoets.MacroStabilityInwards.Service.Converters
+{
+    /// <summary>
+    /// Converter to convert <see cref="MacroStabilityInwardsInput"/> phreatic line offsets properties
+    /// into <see cref="UpliftVanPhreaticLineOffsets"/>.
+    /// </summary>
+    internal static class UpliftVanPhreaticLineOffsetsConverter
+    {
+        /// <summary>
+        /// Converts <see cref="MacroStabilityInwardsInput"/> phreatic line offsets properties
+        /// into <see cref="UpliftVanPhreaticLineOffsets"/>.
+        /// </summary>
+        /// <param name="input">The input to get the properties from.</param>
+        /// <returns>The converted <see cref="UpliftVanPhreaticLineOffsets"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="input"/>
+        /// is <c>null</c>.</exception>
+        public static UpliftVanPhreaticLineOffsets Convert(MacroStabilityInwardsInput input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            return input.UseDefaultOffsets
+                       ? new UpliftVanPhreaticLineOffsets()
+                       : new UpliftVanPhreaticLineOffsets(input.PhreaticLineOffsetBelowDikeTopAtRiver,
+                                                          input.PhreaticLineOffsetBelowDikeTopAtPolder,
+                                                          input.PhreaticLineOffsetBelowDikeToeAtPolder,
+                                                          input.PhreaticLineOffsetBelowShoulderBaseInside);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -191,16 +191,12 @@
                     SurfaceLine = inputParameters.SurfaceLine,
                     SoilProfile = UpliftVanSoilProfileConverter.Convert(inputParameters.SoilProfileUnderSurfaceLine),
                     DrainageConstruction = UpliftVanDrainageConstructionConverter.Convert(inputParameters),
+                    PhreaticLineOffsets = UpliftVanPhreaticLineOffsetsConverter.Convert(inputParameters),
                     DikeSoilScenario = inputParameters.DikeSoilScenario,
                     WaterLevelRiverAverage = inputParameters.WaterLevelRiverAverage,
                     WaterLevelPolder = inputParameters.WaterLevelPolder,
                     MinimumLevelPhreaticLineAtDikeTopRiver = inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver,
                     MinimumLevelPhreaticLineAtDikeTopPolder = inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder,
-                    UseDefaultOffsets = inputParameters.UseDefaultOffsets,
-                    PhreaticLineOffsetBelowDikeTopAtRiver = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowDikeTopAtRiver : double.NaN,
-                    PhreaticLineOffsetBelowDikeTopAtPolder = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowDikeTopAtPolder : double.NaN,
-                    PhreaticLineOffsetBelowShoulderBaseInside = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowShoulderBaseInside : double.NaN,
-                    PhreaticLineOffsetBelowDikeToeAtPolder = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowDikeToeAtPolder : double.NaN,
                     LeakageLengthOutwardsPhreaticLine3 = inputParameters.LeakageLengthOutwardsPhreaticLine3,
                     LeakageLengthInwardsPhreaticLine3 = inputParameters.LeakageLengthInwardsPhreaticLine3,
                     LeakageLengthOutwardsPhreaticLine4 = inputParameters.LeakageLengthOutwardsPhreaticLine4,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj	(.../Ringtoets.MacroStabilityInwards.Service.csproj)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj	(.../Ringtoets.MacroStabilityInwards.Service.csproj)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -42,6 +42,7 @@
     <Compile Include="Converters\MacroStabilityInwardsSlidingCurveConverter.cs" />
     <Compile Include="Converters\MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs" />
     <Compile Include="Converters\UpliftVanDrainageConstructionConverter.cs" />
+    <Compile Include="Converters\UpliftVanPhreaticLineOffsetsConverter.cs" />
     <Compile Include="Converters\UpliftVanSoilProfileConverter.cs" />
     <Compile Include="MacroStabilityInwardsCalculationActivity.cs" />
     <Compile Include="MacroStabilityInwardsCalculationService.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs	(.../UpliftVanCalculatorInputTest.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs	(.../UpliftVanCalculatorInputTest.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -57,23 +57,19 @@
             }, new UpliftVanPreconsolidationStress[0]);
 
             var drainageConstruction = new UpliftVanDrainageConstruction();
+            var phreaticLineOffsets = new UpliftVanPhreaticLineOffsets();
 
             double waterLevelRiverAverage = random.Next();
             double waterLevelPolder = random.Next();
             double minimumLevelPhreaticLineAtDikeTopRiver = random.Next();
             double minimumLevelPhreaticLineAtDikeTopPolder = random.Next();
-            double phreaticLineOffsetBelowDikeTopAtRiver = random.Next();
-            double phreaticLineOffsetBelowDikeTopAtPolder = random.Next();
-            double phreaticLineOffsetBelowShoulderBaseInside = random.Next();
-            double phreaticLineOffsetBelowDikeToeAtPolder = random.Next();
             double leakageLengthOutwardsPhreaticLine3 = random.Next();
             double leakageLengthInwardsPhreaticLine3 = random.Next();
             double leakageLengthOutwardsPhreaticLine4 = random.Next();
             double leakageLengthInwardsPhreaticLine4 = random.Next();
             double piezometricHeadPhreaticLine2Outwards = random.Next();
             double piezometricHeadPhreaticLine2Inwards = random.Next();
             double penetrationLength = random.Next();
-            bool useDefaultOffsets = random.NextBoolean();
             bool adjustPhreaticLine3And4ForUplift = random.NextBoolean();
             var dikeSoilScenario = random.NextEnumValue<MacroStabilityInwardsDikeSoilScenario>();
             bool moveGrid = random.NextBoolean();
@@ -97,22 +93,18 @@
                     SurfaceLine = surfaceLine,
                     SoilProfile = soilProfile,
                     DrainageConstruction = drainageConstruction,
+                    PhreaticLineOffsets = phreaticLineOffsets,
                     WaterLevelRiverAverage = waterLevelRiverAverage,
                     WaterLevelPolder = waterLevelPolder,
                     MinimumLevelPhreaticLineAtDikeTopRiver = minimumLevelPhreaticLineAtDikeTopRiver,
                     MinimumLevelPhreaticLineAtDikeTopPolder = minimumLevelPhreaticLineAtDikeTopPolder,
-                    PhreaticLineOffsetBelowDikeTopAtRiver = phreaticLineOffsetBelowDikeTopAtRiver,
-                    PhreaticLineOffsetBelowDikeTopAtPolder = phreaticLineOffsetBelowDikeTopAtPolder,
-                    PhreaticLineOffsetBelowShoulderBaseInside = phreaticLineOffsetBelowShoulderBaseInside,
-                    PhreaticLineOffsetBelowDikeToeAtPolder = phreaticLineOffsetBelowDikeToeAtPolder,
                     LeakageLengthOutwardsPhreaticLine3 = leakageLengthOutwardsPhreaticLine3,
                     LeakageLengthInwardsPhreaticLine3 = leakageLengthInwardsPhreaticLine3,
                     LeakageLengthOutwardsPhreaticLine4 = leakageLengthOutwardsPhreaticLine4,
                     LeakageLengthInwardsPhreaticLine4 = leakageLengthInwardsPhreaticLine4,
                     PiezometricHeadPhreaticLine2Outwards = piezometricHeadPhreaticLine2Outwards,
                     PiezometricHeadPhreaticLine2Inwards = piezometricHeadPhreaticLine2Inwards,
                     PenetrationLength = penetrationLength,
-                    UseDefaultOffsets = useDefaultOffsets,
                     AdjustPhreaticLine3And4ForUplift = adjustPhreaticLine3And4ForUplift,
                     DikeSoilScenario = dikeSoilScenario,
                     MoveGrid = moveGrid,
@@ -134,23 +126,19 @@
             Assert.AreSame(surfaceLine, input.SurfaceLine);
             Assert.AreSame(soilProfile, input.SoilProfile);
             Assert.AreSame(drainageConstruction, input.DrainageConstruction);
+            Assert.AreSame(phreaticLineOffsets, input.PhreaticLineOffsets);
 
             Assert.AreEqual(waterLevelRiverAverage, input.WaterLevelRiverAverage);
             Assert.AreEqual(waterLevelPolder, input.WaterLevelPolder);
             Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, input.MinimumLevelPhreaticLineAtDikeTopRiver);
             Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, input.MinimumLevelPhreaticLineAtDikeTopPolder);
-            Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtRiver, input.PhreaticLineOffsetBelowDikeTopAtRiver);
-            Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtPolder, input.PhreaticLineOffsetBelowDikeTopAtPolder);
-            Assert.AreEqual(phreaticLineOffsetBelowShoulderBaseInside, input.PhreaticLineOffsetBelowShoulderBaseInside);
-            Assert.AreEqual(phreaticLineOffsetBelowDikeToeAtPolder, input.PhreaticLineOffsetBelowDikeToeAtPolder);
             Assert.AreEqual(leakageLengthOutwardsPhreaticLine3, input.LeakageLengthOutwardsPhreaticLine3);
             Assert.AreEqual(leakageLengthInwardsPhreaticLine3, input.LeakageLengthInwardsPhreaticLine3);
             Assert.AreEqual(leakageLengthOutwardsPhreaticLine4, input.LeakageLengthOutwardsPhreaticLine4);
             Assert.AreEqual(leakageLengthInwardsPhreaticLine4, input.LeakageLengthInwardsPhreaticLine4);
             Assert.AreEqual(piezometricHeadPhreaticLine2Outwards, input.PiezometricHeadPhreaticLine2Outwards);
             Assert.AreEqual(piezometricHeadPhreaticLine2Inwards, input.PiezometricHeadPhreaticLine2Inwards);
             Assert.AreEqual(penetrationLength, input.PenetrationLength);
-            Assert.AreEqual(useDefaultOffsets, input.UseDefaultOffsets);
             Assert.AreEqual(adjustPhreaticLine3And4ForUplift, input.AdjustPhreaticLine3And4ForUplift);
 
             Assert.AreEqual(dikeSoilScenario, input.DikeSoilScenario);
@@ -181,6 +169,7 @@
             Assert.IsNull(input.SurfaceLine);
             Assert.IsNull(input.SoilProfile);
             Assert.IsNull(input.DrainageConstruction);
+            Assert.IsNull(input.PhreaticLineOffsets);
             Assert.IsNull(input.LeftGrid);
             Assert.IsNull(input.RightGrid);
 
@@ -189,10 +178,6 @@
             Assert.IsNaN(input.WaterLevelPolder);
             Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopRiver);
             Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopPolder);
-            Assert.IsNaN(input.PhreaticLineOffsetBelowDikeTopAtRiver);
-            Assert.IsNaN(input.PhreaticLineOffsetBelowDikeToeAtPolder);
-            Assert.IsNaN(input.PhreaticLineOffsetBelowShoulderBaseInside);
-            Assert.IsNaN(input.PhreaticLineOffsetBelowDikeToeAtPolder);
             Assert.IsNaN(input.LeakageLengthOutwardsPhreaticLine3);
             Assert.IsNaN(input.LeakageLengthInwardsPhreaticLine3);
             Assert.IsNaN(input.LeakageLengthOutwardsPhreaticLine4);
@@ -207,7 +192,6 @@
             Assert.IsNaN(input.SlipPlaneMinimumLength);
             
             Assert.IsFalse(input.AdjustPhreaticLine3And4ForUplift);
-            Assert.IsFalse(input.UseDefaultOffsets);
             Assert.IsFalse(input.MoveGrid);
             Assert.IsFalse(input.GridAutomaticDetermined);
             Assert.IsFalse(input.TangentLineAutomaticAtBoundaries);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanPhreaticLineOffsetsTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanPhreaticLineOffsetsTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanPhreaticLineOffsetsTest.cs	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -0,0 +1,66 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Calculators.UpliftVan.Input
+{
+    [TestFixture]
+    public class UpliftVanPhreaticLineOffsetsTest
+    {
+        [Test]
+        public void ParameterlessConstructor_ExpectedValues()
+        {
+            // Call
+            var offsets = new UpliftVanPhreaticLineOffsets();
+
+            // Assert
+            Assert.IsTrue(offsets.UseDefaults);
+            Assert.IsNaN(offsets.BelowDikeTopAtRiver);
+            Assert.IsNaN(offsets.BelowDikeTopAtPolder);
+            Assert.IsNaN(offsets.BelowDikeToeAtPolder);
+            Assert.IsNaN(offsets.BelowShoulderBaseInside);
+        }
+
+        [Test]
+        public void ParameterdConstructor_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(11);
+            double belowDikeTopAtRiver = random.NextDouble();
+            double belowDikeTopAtPolder = random.NextDouble();
+            double belowDikeToeAtPolder = random.NextDouble();
+            double belowShoulderBaseInside = random.NextDouble();
+
+            // Call
+            var offsets = new UpliftVanPhreaticLineOffsets(belowDikeTopAtRiver, belowDikeTopAtPolder, belowDikeToeAtPolder, belowShoulderBaseInside);
+
+            // Assert
+            Assert.IsFalse(offsets.UseDefaults);
+            Assert.AreEqual(belowDikeTopAtRiver, offsets.BelowDikeTopAtRiver);
+            Assert.AreEqual(belowDikeTopAtPolder, offsets.BelowDikeTopAtPolder);
+            Assert.AreEqual(belowDikeToeAtPolder, offsets.BelowDikeToeAtPolder);
+            Assert.AreEqual(belowShoulderBaseInside, offsets.BelowShoulderBaseInside);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -221,7 +221,8 @@
                 SoilProfile = CreateValidSoilProfile(surfaceLine),
                 LeftGrid = new MacroStabilityInwardsGrid(),
                 RightGrid = new MacroStabilityInwardsGrid(),
-                DrainageConstruction = new UpliftVanDrainageConstruction()
+                DrainageConstruction = new UpliftVanDrainageConstruction(),
+                PhreaticLineOffsets = new UpliftVanPhreaticLineOffsets()
             });
         }
 
@@ -237,22 +238,18 @@
                 SurfaceLine = surfaceLine,
                 SoilProfile = CreateValidSoilProfile(surfaceLine),
                 DrainageConstruction = new UpliftVanDrainageConstruction(),
+                PhreaticLineOffsets = new UpliftVanPhreaticLineOffsets(),
                 WaterLevelRiverAverage = random.Next(),
                 WaterLevelPolder = random.Next(),
                 MinimumLevelPhreaticLineAtDikeTopRiver = random.Next(),
                 MinimumLevelPhreaticLineAtDikeTopPolder = random.Next(),
-                PhreaticLineOffsetBelowDikeTopAtRiver = random.Next(),
-                PhreaticLineOffsetBelowDikeTopAtPolder = random.Next(),
-                PhreaticLineOffsetBelowShoulderBaseInside = random.Next(),
-                PhreaticLineOffsetBelowDikeToeAtPolder = random.Next(),
                 LeakageLengthOutwardsPhreaticLine3 = random.Next(),
                 LeakageLengthInwardsPhreaticLine3 = random.Next(),
                 LeakageLengthOutwardsPhreaticLine4 = random.Next(),
                 LeakageLengthInwardsPhreaticLine4 = random.Next(),
                 PiezometricHeadPhreaticLine2Outwards = random.Next(),
                 PiezometricHeadPhreaticLine2Inwards = random.Next(),
                 PenetrationLength = random.Next(),
-                UseDefaultOffsets = random.NextBoolean(),
                 AdjustPhreaticLine3And4ForUplift = random.NextBoolean(),
                 DikeSoilScenario = random.NextEnumValue<MacroStabilityInwardsDikeSoilScenario>(),
                 MoveGrid = random.NextBoolean(),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs	(.../StabilityLocationCreatorTest.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs	(.../StabilityLocationCreatorTest.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -76,7 +76,8 @@
                 new UpliftVanCalculatorInput.ConstructionProperties
                 {
                     DikeSoilScenario = macroStabilityInwardsDikeSoilScenario,
-                    DrainageConstruction = new UpliftVanDrainageConstruction()
+                    DrainageConstruction = new UpliftVanDrainageConstruction(),
+                    PhreaticLineOffsets = new UpliftVanPhreaticLineOffsets()
                 });
 
             // Call
@@ -98,7 +99,6 @@
             double zCoordinateDrainageConstruction = random.Next();
             double minimumLevelPhreaticLineAtDikeTopRiver = random.Next();
             double minimumLevelPhreaticLineAtDikeTopPolder = random.Next();
-            bool useDefaultOffsets = random.NextBoolean();
             double phreaticLineOffsetBelowDikeTopAtRiver = random.Next();
             double phreaticLineOffsetBelowDikeTopAtPolder = random.Next();
             double phreaticLineOffsetBelowShoulderBaseInside = random.Next();
@@ -113,6 +113,8 @@
             double penetrationLength = random.Next();
 
             var drainageConstruction = new UpliftVanDrainageConstruction(xCoordinateDrainageConstruction, zCoordinateDrainageConstruction);
+            var phreaticLineOffsets = new UpliftVanPhreaticLineOffsets(phreaticLineOffsetBelowDikeTopAtRiver, phreaticLineOffsetBelowDikeTopAtPolder,
+                                                                       phreaticLineOffsetBelowDikeToeAtPolder, phreaticLineOffsetBelowShoulderBaseInside);
 
             var input = new UpliftVanCalculatorInput(
                 new UpliftVanCalculatorInput.ConstructionProperties
@@ -122,13 +124,9 @@
                     WaterLevelRiverAverage = waterLevelRiverAverage,
                     WaterLevelPolder = waterLevelPolder,
                     DrainageConstruction = drainageConstruction,
+                    PhreaticLineOffsets = phreaticLineOffsets,
                     MinimumLevelPhreaticLineAtDikeTopRiver = minimumLevelPhreaticLineAtDikeTopRiver,
                     MinimumLevelPhreaticLineAtDikeTopPolder = minimumLevelPhreaticLineAtDikeTopPolder,
-                    UseDefaultOffsets = useDefaultOffsets,
-                    PhreaticLineOffsetBelowDikeTopAtRiver = phreaticLineOffsetBelowDikeTopAtRiver,
-                    PhreaticLineOffsetBelowDikeTopAtPolder = phreaticLineOffsetBelowDikeTopAtPolder,
-                    PhreaticLineOffsetBelowShoulderBaseInside = phreaticLineOffsetBelowShoulderBaseInside,
-                    PhreaticLineOffsetBelowDikeToeAtPolder = phreaticLineOffsetBelowDikeToeAtPolder,
                     AdjustPhreaticLine3And4ForUplift = adjustPhreaticLine3And4ForUplift,
                     LeakageLengthOutwardsPhreaticLine3 = leakageLengthOutwardsPhreaticLine3,
                     LeakageLengthInwardsPhreaticLine3 = leakageLengthInwardsPhreaticLine3,
@@ -155,7 +153,7 @@
             Assert.AreEqual(zCoordinateDrainageConstruction, location.ZCoordMiddleDrainageConstruction);
             Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, location.MinimumLevelPhreaticLineAtDikeTopRiver);
             Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, location.MinimumLevelPhreaticLineAtDikeTopPolder);
-            Assert.AreEqual(useDefaultOffsets, location.UseDefaultOffsets);
+            Assert.IsFalse(location.UseDefaultOffsets);
             Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtRiver, location.PlLineOffsetBelowPointBRingtoetsWti2017);
             Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtPolder, location.PlLineOffsetBelowDikeTopAtPolder);
             Assert.AreEqual(phreaticLineOffsetBelowShoulderBaseInside, location.PlLineOffsetBelowShoulderBaseInside);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -63,6 +63,7 @@
     </Compile>
     <Compile Include="Calculators\MacroStabilityInwardsCalculatorFactoryTest.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanDrainageConstructionTest.cs" />
+    <Compile Include="Calculators\UpliftVan\Input\UpliftVanPhreaticLineOffsetsTest.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanPreconsolidationStressTest.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanShearStrengthModelTest.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanSoilLayerTest.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanPhreaticLineOffsetsConverterTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanPhreaticLineOffsetsConverterTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanPhreaticLineOffsetsConverterTest.cs	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -0,0 +1,95 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+using Ringtoets.MacroStabilityInwards.Service.Converters;
+
+namespace Ringtoets.MacroStabilityInwards.Service.Test.Converters
+{
+    [TestFixture]
+    public class UpliftVanPhreaticLineOffsetsConverterTest
+    {
+        [Test]
+        public void Convert_InputNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => UpliftVanPhreaticLineOffsetsConverter.Convert(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("input", exception.ParamName);
+        }
+
+        [Test]
+        public void Convert_UseDefaultOffsetsTrue_ReturnUpliftVanPhreaticLineOffsets()
+        {
+            // Setup
+            var random = new Random(11);
+            var input = new MacroStabilityInwardsInput
+            {
+                UseDefaultOffsets = true,
+                PhreaticLineOffsetBelowDikeTopAtRiver = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeTopAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeToeAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowShoulderBaseInside = random.NextRoundedDouble()
+            };
+
+            // Call
+            UpliftVanPhreaticLineOffsets offsets = UpliftVanPhreaticLineOffsetsConverter.Convert(input);
+
+            // Assert
+            Assert.IsTrue(offsets.UseDefaults);
+            Assert.IsNaN(offsets.BelowDikeTopAtRiver);
+            Assert.IsNaN(offsets.BelowDikeTopAtPolder);
+            Assert.IsNaN(offsets.BelowDikeToeAtPolder);
+            Assert.IsNaN(offsets.BelowShoulderBaseInside);            
+        }
+
+        [Test]
+        public void Convert_UseDefaultOffsetsFalses_ReturnUpliftVanPhreaticLineOffsets()
+        {
+            // Setup
+            var random = new Random(11);
+            var input = new MacroStabilityInwardsInput
+            {
+                UseDefaultOffsets = false,
+                PhreaticLineOffsetBelowDikeTopAtRiver = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeTopAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeToeAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowShoulderBaseInside = random.NextRoundedDouble()
+            };
+
+            // Call
+            UpliftVanPhreaticLineOffsets offsets = UpliftVanPhreaticLineOffsetsConverter.Convert(input);
+
+            // Assert
+            Assert.IsFalse(offsets.UseDefaults);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowDikeTopAtRiver, offsets.BelowDikeTopAtRiver);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowDikeTopAtPolder, offsets.BelowDikeTopAtPolder);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowDikeToeAtPolder, offsets.BelowDikeToeAtPolder);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowShoulderBaseInside, offsets.BelowShoulderBaseInside);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -373,10 +373,10 @@
                 UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance)
                     .LastCreatedUpliftVanCalculator.Input;
                 Assert.IsFalse(actualInput.DrainageConstruction.IsPresent);
-                Assert.IsNaN(actualInput.PhreaticLineOffsetBelowDikeToeAtPolder);
-                Assert.IsNaN(actualInput.PhreaticLineOffsetBelowDikeTopAtPolder);
-                Assert.IsNaN(actualInput.PhreaticLineOffsetBelowDikeTopAtRiver);
-                Assert.IsNaN(actualInput.PhreaticLineOffsetBelowShoulderBaseInside);
+                Assert.IsNaN(actualInput.PhreaticLineOffsets.BelowDikeToeAtPolder);
+                Assert.IsNaN(actualInput.PhreaticLineOffsets.BelowDikeTopAtPolder);
+                Assert.IsNaN(actualInput.PhreaticLineOffsets.BelowDikeTopAtRiver);
+                Assert.IsNaN(actualInput.PhreaticLineOffsets.BelowShoulderBaseInside);
             }
         }
 
@@ -452,10 +452,11 @@
             Assert.AreEqual(originalInput.ZCoordinateDrainageConstruction, actualInput.DrainageConstruction.ZCoordinate);
             Assert.AreEqual(originalInput.MinimumLevelPhreaticLineAtDikeTopRiver, actualInput.MinimumLevelPhreaticLineAtDikeTopRiver);
             Assert.AreEqual(originalInput.MinimumLevelPhreaticLineAtDikeTopPolder, actualInput.MinimumLevelPhreaticLineAtDikeTopPolder);
-            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowDikeTopAtRiver, actualInput.PhreaticLineOffsetBelowDikeTopAtRiver);
-            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowDikeTopAtPolder, actualInput.PhreaticLineOffsetBelowDikeTopAtPolder);
-            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowShoulderBaseInside, actualInput.PhreaticLineOffsetBelowShoulderBaseInside);
-            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowDikeToeAtPolder, actualInput.PhreaticLineOffsetBelowDikeToeAtPolder);
+            Assert.AreEqual(originalInput.UseDefaultOffsets, actualInput.PhreaticLineOffsets.UseDefaults);
+            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowDikeTopAtRiver, actualInput.PhreaticLineOffsets.BelowDikeTopAtRiver);
+            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowDikeTopAtPolder, actualInput.PhreaticLineOffsets.BelowDikeTopAtPolder);
+            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowShoulderBaseInside, actualInput.PhreaticLineOffsets.BelowShoulderBaseInside);
+            Assert.AreEqual(originalInput.PhreaticLineOffsetBelowDikeToeAtPolder, actualInput.PhreaticLineOffsets.BelowDikeToeAtPolder);
             Assert.AreEqual(originalInput.LeakageLengthOutwardsPhreaticLine3, actualInput.LeakageLengthOutwardsPhreaticLine3);
             Assert.AreEqual(originalInput.LeakageLengthInwardsPhreaticLine3, actualInput.LeakageLengthInwardsPhreaticLine3);
             Assert.AreEqual(originalInput.LeakageLengthOutwardsPhreaticLine4, actualInput.LeakageLengthOutwardsPhreaticLine4);
@@ -464,7 +465,6 @@
             Assert.AreEqual(originalInput.PiezometricHeadPhreaticLine2Inwards, actualInput.PiezometricHeadPhreaticLine2Inwards);
             Assert.AreEqual(originalInput.PenetrationLength, actualInput.PenetrationLength);
             Assert.AreEqual(originalInput.AdjustPhreaticLine3And4ForUplift, actualInput.AdjustPhreaticLine3And4ForUplift);
-            Assert.AreEqual(originalInput.UseDefaultOffsets, actualInput.UseDefaultOffsets);
             Assert.AreEqual(originalInput.MoveGrid, actualInput.MoveGrid);
             Assert.AreEqual(originalInput.MaximumSliceWidth, actualInput.MaximumSliceWidth);
             Assert.AreEqual(originalInput.GridDeterminationType == MacroStabilityInwardsGridDeterminationType.Automatic, actualInput.GridAutomaticDetermined);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r6052143f9ba210f1c75453904ff4bc462e3490d7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Service.Test.csproj)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Service.Test.csproj)	(revision 6052143f9ba210f1c75453904ff4bc462e3490d7)
@@ -63,6 +63,7 @@
     <Compile Include="Converters\MacroStabilityInwardsSlidingCurveConverterTest.cs" />
     <Compile Include="Converters\MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs" />
     <Compile Include="Converters\UpliftVanDrainageConstructionConverterTest.cs" />
+    <Compile Include="Converters\UpliftVanPhreaticLineOffsetsConverterTest.cs" />
     <Compile Include="Converters\UpliftVanSoilProfileConverterTest.cs" />
     <Compile Include="MacroStabilityInwardsCalculationActivityTest.cs" />
     <Compile Include="MacroStabilityInwardsCalculationServiceTest.cs" />