Index: Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputExtensions.cs
===================================================================
diff -u -rd1b677c4bef119458dc4ec64058c68dd508578e3 -rd686300369637e5349c371a8031b61542b2815e2
--- Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputExtensions.cs	(.../WaveConditionsInputExtensions.cs)	(revision d1b677c4bef119458dc4ec64058c68dd508578e3)
+++ Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputExtensions.cs	(.../WaveConditionsInputExtensions.cs)	(revision d686300369637e5349c371a8031b61542b2815e2)
@@ -65,7 +65,7 @@
 
             waterLevels.Add(upperBoundary);
 
-            double stepSizeValue = waveConditionsInput.StepSize.AsValue();
+            double stepSizeValue = waveConditionsInput.StepSize;
             var currentWaterLevel = new RoundedDouble(2, Math.Ceiling(upperBoundary / stepSizeValue) * stepSizeValue - stepSizeValue);
 
             while (currentWaterLevel > lowerBoundary)
Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs
===================================================================
diff -u -rd1b677c4bef119458dc4ec64058c68dd508578e3 -rd686300369637e5349c371a8031b61542b2815e2
--- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs	(.../WaveConditionsInputExtensionsTest.cs)	(revision d1b677c4bef119458dc4ec64058c68dd508578e3)
+++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs	(.../WaveConditionsInputExtensionsTest.cs)	(revision d686300369637e5349c371a8031b61542b2815e2)
@@ -53,7 +53,7 @@
             {
                 LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetments,
                 UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetments,
-                StepSize = WaveConditionsInputStepSize.One,
+                StepSize = (RoundedDouble) 1.0,
                 LowerBoundaryWaterLevels = (RoundedDouble) 1.0,
                 UpperBoundaryWaterLevels = (RoundedDouble) 10.0
             };
@@ -75,7 +75,7 @@
                 UpperBoundaryRevetment = (RoundedDouble) 6.10,
                 LowerBoundaryWaterLevels = (RoundedDouble) 6.20,
                 UpperBoundaryWaterLevels = (RoundedDouble) 10,
-                StepSize = WaveConditionsInputStepSize.Half
+                StepSize = (RoundedDouble) 0.5
             };
 
             // Call
@@ -93,7 +93,7 @@
             {
                 LowerBoundaryRevetment = (RoundedDouble) 1.0,
                 UpperBoundaryRevetment = (RoundedDouble) 10.0,
-                StepSize = WaveConditionsInputStepSize.One,
+                StepSize = (RoundedDouble) 1.0,
                 LowerBoundaryWaterLevels = (RoundedDouble) 1.0,
                 UpperBoundaryWaterLevels = (RoundedDouble) 10.0
             };
@@ -107,7 +107,7 @@
 
         [Test]
         [TestCaseSource(nameof(WaterLevels))]
-        public void GetWaterLevels_ValidInput_ReturnsExpectedWaterLevels(WaveConditionsInputStepSize stepSize,
+        public void GetWaterLevels_ValidInput_ReturnsExpectedWaterLevels(double stepSize,
                                                                          double lowerBoundaryRevetment,
                                                                          double upperBoundaryRevetment,
                                                                          double lowerBoundaryWaterLevels,
@@ -120,7 +120,7 @@
             {
                 LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment,
                 UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment,
-                StepSize = stepSize,
+                StepSize = (RoundedDouble) stepSize,
                 LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels,
                 UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels
             };
@@ -134,13 +134,13 @@
 
         private static IEnumerable<TestCaseData> WaterLevels()
         {
-            yield return new TestCaseData(WaveConditionsInputStepSize.Two, 2.58, 6.10, 2.40, 3.89, 5.99, new[]
+            yield return new TestCaseData(2, 2.58, 6.10, 2.40, 3.89, 5.99, new[]
             {
                 new RoundedDouble(2, 3.89),
                 new RoundedDouble(2, 2.58)
             });
 
-            yield return new TestCaseData(WaveConditionsInputStepSize.Half, 3.58, 6.10, 3.40, 5.88, 5.99, new[]
+            yield return new TestCaseData(0.5, 3.58, 6.10, 3.40, 5.88, 5.99, new[]
             {
                 new RoundedDouble(2, 5.88),
                 new RoundedDouble(2, 5.5),
@@ -150,7 +150,7 @@
                 new RoundedDouble(2, 3.58)
             });
 
-            yield return new TestCaseData(WaveConditionsInputStepSize.One, -1.30, 5.80, -1.20, 6.01, 6.10, new[]
+            yield return new TestCaseData(1, -1.30, 5.80, -1.20, 6.01, 6.10, new[]
             {
                 new RoundedDouble(2, 5.80),
                 new RoundedDouble(2, 5),
@@ -163,7 +163,7 @@
                 new RoundedDouble(2, -1.20)
             });
 
-            yield return new TestCaseData(WaveConditionsInputStepSize.Two, -4.29, 8.67, -4.29, 8.58, 8.58, new[]
+            yield return new TestCaseData(2, -4.29, 8.67, -4.29, 8.58, 8.58, new[]
             {
                 new RoundedDouble(2, 8.57),
                 new RoundedDouble(2, 8),
@@ -176,7 +176,7 @@
                 new RoundedDouble(2, -4.29)
             });
 
-            yield return new TestCaseData(WaveConditionsInputStepSize.Two, -4.29, 8.67, double.NaN, double.NaN, 8.58, new[]
+            yield return new TestCaseData(2, -4.29, 8.67, double.NaN, double.NaN, 8.58, new[]
             {
                 new RoundedDouble(2, 8.57),
                 new RoundedDouble(2, 8),