Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs
===================================================================
diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs	(.../DuneLocationCreateExtensionsTest.cs)	(revision fe90a6d174a01975381e6cda55ed1f7f4e831a51)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs	(.../DuneLocationCreateExtensionsTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -159,8 +159,12 @@
 
             var location = new TestDuneLocation
             {
-                Output = duneLocationOutput
+                Calculation =
+                {
+                    Output = duneLocationOutput
+                }
             };
+
             var registry = new PersistenceRegistry();
 
             // Call
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -re64b4b8f531f7dc251a61efec45cb52089ab8ea7 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision e64b4b8f531f7dc251a61efec45cb52089ab8ea7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -1084,7 +1084,7 @@
             Assert.AreEqual(expectedLocation.Offset, actualLocation.Offset);
             Assert.AreEqual(expectedLocation.Orientation, actualLocation.Orientation);
             Assert.AreEqual(expectedLocation.D50, actualLocation.D50);
-            AssertDuneBoundaryLocationOutput(expectedLocation.Output, actualLocation.Output);
+            AssertDuneBoundaryLocationOutput(expectedLocation.Calculation.Output, actualLocation.Calculation.Output);
         }
 
         private static void AssertDuneBoundaryLocationOutput(DuneLocationOutput expectedOutput, DuneLocationOutput actualOutput)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a323b4d102e3ce2ce522c8cac994a9643724b78 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs	(.../DuneLocationEntityReadExtensionsTest.cs)	(revision 5a323b4d102e3ce2ce522c8cac994a9643724b78)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs	(.../DuneLocationEntityReadExtensionsTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -99,7 +99,7 @@
             Assert.AreEqual(offset, location.Offset, location.Offset.GetAccuracy());
             Assert.AreEqual(orientation, location.Orientation, location.Orientation.GetAccuracy());
             Assert.AreEqual(d50, location.D50, location.D50.GetAccuracy());
-            Assert.IsNull(location.Output);
+            Assert.IsNull(location.Calculation.Output);
 
             Assert.IsTrue(collector.Contains(entity));
         }
@@ -139,7 +139,7 @@
             Assert.IsNaN(location.Offset);
             Assert.IsNaN(location.Orientation);
             Assert.IsNaN(location.D50);
-            Assert.IsNull(location.Output);
+            Assert.IsNull(location.Calculation.Output);
 
             Assert.IsTrue(collector.Contains(entity));
         }
@@ -180,7 +180,7 @@
 
             // Assert
             Assert.IsNotNull(location);
-            AssertDuneLocationOutput(duneLocationOutputEntity, location.Output);
+            AssertDuneLocationOutput(duneLocationOutputEntity, location.Calculation.Output);
         }
 
         [Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
===================================================================
diff -u -r39e941a3f116d264000cd6f46a61f64674063933 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision 39e941a3f116d264000cd6f46a61f64674063933)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -399,12 +399,12 @@
             List<DuneLocation> duneLocations = failureMechanism.DuneLocations;
 
             Assert.AreEqual(3, duneLocations.Count);
-            Assert.IsNull(duneLocations[0].Output);
+            Assert.IsNull(duneLocations[0].Calculation.Output);
 
-            Assert.IsNotNull(duneLocations[1].Output);
-            Assert.AreEqual(CalculationConvergence.NotCalculated, duneLocations[1].Output.CalculationConvergence);
-            Assert.IsNotNull(duneLocations[2].Output);
-            Assert.AreEqual(CalculationConvergence.CalculatedConverged, duneLocations[2].Output.CalculationConvergence);
+            Assert.IsNotNull(duneLocations[1].Calculation.Output);
+            Assert.AreEqual(CalculationConvergence.NotCalculated, duneLocations[1].Calculation.Output.CalculationConvergence);
+            Assert.IsNotNull(duneLocations[2].Calculation.Output);
+            Assert.AreEqual(CalculationConvergence.CalculatedConverged, duneLocations[2].Calculation.Output.CalculationConvergence);
 
             Assert.AreEqual(3, failureMechanism.SectionResults.Count());
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r0329d5c996b70d65ef323041fc5424e974c6bfc2 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 0329d5c996b70d65ef323041fc5424e974c6bfc2)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -732,8 +732,11 @@
             var locationWithOutput = new DuneLocation(13, "DuneLocation with output", new Point2D(791, 456),
                                                       new DuneLocation.ConstructionProperties())
             {
-                Output = new DuneLocationOutput(CalculationConvergence.NotCalculated,
-                                                new DuneLocationOutput.ConstructionProperties())
+                Calculation =
+                {
+                    Output = new DuneLocationOutput(CalculationConvergence.NotCalculated,
+                                                    new DuneLocationOutput.ConstructionProperties())
+                }
             };
 
             var locationCalculated = new DuneLocation(14, "DuneLocation with calculated output",
@@ -745,17 +748,20 @@
                                                           D50 = 4
                                                       })
             {
-                Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged,
-                                                new DuneLocationOutput.ConstructionProperties
-                                                {
-                                                    WaterLevel = 10,
-                                                    WaveHeight = 20,
-                                                    WavePeriod = 30,
-                                                    TargetProbability = 0.4,
-                                                    TargetReliability = 50,
-                                                    CalculatedProbability = 0.6,
-                                                    CalculatedReliability = 70
-                                                })
+                Calculation =
+                {
+                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged,
+                                                    new DuneLocationOutput.ConstructionProperties
+                                                    {
+                                                        WaterLevel = 10,
+                                                        WaveHeight = 20,
+                                                        WavePeriod = 30,
+                                                        TargetProbability = 0.4,
+                                                        TargetReliability = 50,
+                                                        CalculatedProbability = 0.6,
+                                                        CalculatedReliability = 70
+                                                    })
+                }
             };
 
             failureMechanism.DuneLocations.Add(locationWithoutOutput);
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs
===================================================================
diff -u -r397eafbec8987f6aa2e31318745c4e07ed575981 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs	(.../DuneErosionBoundaryCalculationService.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs	(.../DuneErosionBoundaryCalculationService.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -61,7 +61,7 @@
             CalculationServiceHelper.LogValidationBegin();
 
             string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath,
-                                                                                                                  preprocessorDirectory);
+                                                                                                                   preprocessorDirectory);
             if (!string.IsNullOrEmpty(databaseFilePathValidationProblem))
             {
                 CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
@@ -91,7 +91,7 @@
 
         /// <summary>
         /// Performs a dune erosion calculation based on the supplied <see cref="DuneLocation"/>
-        /// and sets the <see cref="DuneLocation.Output"/> if the calculation is successful.
+        /// and sets the <see cref="DuneLocationCalculation.Output"/> if the calculation is successful.
         /// Error and status information is logged during the execution of the operation.
         /// </summary>
         /// <param name="duneLocation">The <see cref="DuneLocation"/> that holds information required 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs
===================================================================
diff -u -rb633ec894f0b9c1878e978b24a0c870480fd604b -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs	(.../TestDuneLocationTest.cs)	(revision b633ec894f0b9c1878e978b24a0c870480fd604b)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs	(.../TestDuneLocationTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -41,7 +41,7 @@
             Assert.AreEqual(0, testLocation.CoastalAreaId);
             Assert.AreEqual(0, testLocation.D50.Value);
 
-            Assert.IsNull(testLocation.Output);
+            Assert.IsNull(testLocation.Calculation.Output);
         }
 
         [Test]
@@ -62,7 +62,7 @@
             Assert.AreEqual(0, testLocation.CoastalAreaId);
             Assert.AreEqual(0, testLocation.D50.Value);
 
-            Assert.IsNull(testLocation.Output);
+            Assert.IsNull(testLocation.Calculation.Output);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -radadf1a820c1c6f418f30411352bf661214dd2ae -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs	(.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs)	(revision adadf1a820c1c6f418f30411352bf661214dd2ae)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs	(.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -174,7 +174,7 @@
             public ChangePropertyTestCase(ICollection<DuneLocation> locations)
             {
                 Locations = locations;
-                ExpectedAffectedLocations = locations.Where(c => c.Output != null).ToArray();
+                ExpectedAffectedLocations = locations.Where(c => c.Calculation.Output != null).ToArray();
             }
 
             public ICollection<DuneLocation> Locations { get; }
@@ -244,7 +244,10 @@
         {
             return new TestDuneLocation
             {
-                Output = new TestDuneLocationOutput()
+                Calculation =
+                {
+                    Output = new TestDuneLocationOutput()
+                }
             };
         }
     }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs	(.../DuneErosionMapDataFeaturesFactoryTest.cs)	(revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs	(.../DuneErosionMapDataFeaturesFactoryTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -68,7 +68,10 @@
             };
             DuneLocation[] locations = points.Select(p => new ValidDuneLocation(p)
             {
-                Output = new TestDuneLocationOutput()
+                Calculation =
+                {
+                    Output = new TestDuneLocationOutput()
+                }
             }).Cast<DuneLocation>().ToArray();
 
             // Call
@@ -82,12 +85,12 @@
                 Assert.AreEqual(locations[i].Name, features[i].MetaData["Naam"]);
                 Assert.AreEqual(locations[i].CoastalAreaId, features[i].MetaData["Kustvaknummer"]);
                 Assert.AreEqual(locations[i].Offset.ToString("0.#", CultureInfo.InvariantCulture), features[i].MetaData["Metrering"]);
-                Assert.AreEqual(locations[i].Output.WaterLevel, (double) features[i].MetaData["Rekenwaarde waterstand"],
-                                locations[i].Output.WaterLevel.GetAccuracy());
-                Assert.AreEqual(locations[i].Output.WaveHeight, (double) features[i].MetaData["Rekenwaarde Hs"],
-                                locations[i].Output.WaveHeight.GetAccuracy());
-                Assert.AreEqual(locations[i].Output.WavePeriod, (double) features[i].MetaData["Rekenwaarde Tp"],
-                                locations[i].Output.WavePeriod.GetAccuracy());
+                Assert.AreEqual(locations[i].Calculation.Output.WaterLevel, (double) features[i].MetaData["Rekenwaarde waterstand"],
+                                locations[i].Calculation.Output.WaterLevel.GetAccuracy());
+                Assert.AreEqual(locations[i].Calculation.Output.WaveHeight, (double) features[i].MetaData["Rekenwaarde Hs"],
+                                locations[i].Calculation.Output.WaveHeight.GetAccuracy());
+                Assert.AreEqual(locations[i].Calculation.Output.WavePeriod, (double) features[i].MetaData["Rekenwaarde Tp"],
+                                locations[i].Calculation.Output.WavePeriod.GetAccuracy());
                 Assert.AreEqual(locations[i].D50, (RoundedDouble) features[i].MetaData["Rekenwaarde d50"],
                                 locations[i].D50.GetAccuracy());
                 Assert.AreEqual(8, features[i].MetaData.Keys.Count);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs
===================================================================
diff -u -r379841aa99f863993d1682aa1ed6e7cb771422a4 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs	(.../DuneLocationPropertiesTest.cs)	(revision 379841aa99f863993d1682aa1ed6e7cb771422a4)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs	(.../DuneLocationPropertiesTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -147,7 +147,10 @@
                                                 D50 = d50
                                             })
             {
-                Output = output
+                Calculation =
+                {
+                    Output = output
+                }
             };
 
             // Call
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs
===================================================================
diff -u -r051a26d33402c4ce108bb800139393692c1aedde -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision 051a26d33402c4ce108bb800139393692c1aedde)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -341,14 +341,14 @@
                 Assert.IsNaN((double) duneLocationFeature.MetaData["Rekenwaarde waterstand"]);
 
                 // Call
-                duneLocation.Output = new TestDuneLocationOutput();
+                duneLocation.Calculation.Output = new TestDuneLocationOutput();
                 duneLocation.NotifyObservers();
 
                 // Assert
                 MapFeature duneLocationFeatureUpdated = duneLocationsMapData.Features.First();
-                Assert.AreEqual(duneLocation.Output.WavePeriod, (double) duneLocationFeatureUpdated.MetaData["Rekenwaarde Tp"]);
-                Assert.AreEqual(duneLocation.Output.WaveHeight, (double) duneLocationFeatureUpdated.MetaData["Rekenwaarde Hs"]);
-                Assert.AreEqual(duneLocation.Output.WaterLevel, (double) duneLocationFeatureUpdated.MetaData["Rekenwaarde waterstand"]);
+                Assert.AreEqual(duneLocation.Calculation.Output.WavePeriod, (double) duneLocationFeatureUpdated.MetaData["Rekenwaarde Tp"]);
+                Assert.AreEqual(duneLocation.Calculation.Output.WaveHeight, (double) duneLocationFeatureUpdated.MetaData["Rekenwaarde Hs"]);
+                Assert.AreEqual(duneLocation.Calculation.Output.WaterLevel, (double) duneLocationFeatureUpdated.MetaData["Rekenwaarde waterstand"]);
             }
         }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs	(.../DuneLocationRowTest.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs	(.../DuneLocationRowTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -47,12 +47,15 @@
                 D50 = 0.000183
             })
             {
-                Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                Calculation =
                 {
-                    WaterLevel = 3.0,
-                    WaveHeight = 4.0,
-                    WavePeriod = 5.0
-                })
+                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                    {
+                        WaterLevel = 3.0,
+                        WaveHeight = 4.0,
+                        WavePeriod = 5.0
+                    })
+                }
             };
 
             // Call
@@ -67,9 +70,9 @@
             Assert.AreEqual(location.CoastalAreaId, row.CoastalAreaId);
             Assert.AreEqual(location.Offset.ToString("0.#", CultureInfo.InvariantCulture), row.Offset);
             Assert.AreEqual(location.D50, row.D50);
-            Assert.AreEqual(location.Output.WaterLevel, row.WaterLevel);
-            Assert.AreEqual(location.Output.WaveHeight, row.WaveHeight);
-            Assert.AreEqual(location.Output.WavePeriod, row.WavePeriod);
+            Assert.AreEqual(location.Calculation.Output.WaterLevel, row.WaterLevel);
+            Assert.AreEqual(location.Calculation.Output.WaveHeight, row.WaveHeight);
+            Assert.AreEqual(location.Calculation.Output.WavePeriod, row.WavePeriod);
 
             TestHelper.AssertTypeConverter<DuneLocationRow, NoValueRoundedDoubleConverter>(
                 nameof(DuneLocationRow.WaterLevel));
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs
===================================================================
diff -u -r051a26d33402c4ce108bb800139393692c1aedde -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs	(.../DuneLocationsViewTest.cs)	(revision 051a26d33402c4ce108bb800139393692c1aedde)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs	(.../DuneLocationsViewTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -291,12 +291,15 @@
                 D50 = 0.000321
             })
             {
-                Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                Calculation =
                 {
-                    WaterLevel = 3.21,
-                    WaveHeight = 4.32,
-                    WavePeriod = 5.43
-                })
+                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                    {
+                        WaterLevel = 3.21,
+                        WaveHeight = 4.32,
+                        WavePeriod = 5.43
+                    })
+                }
             };
             locations.Clear();
             locations.Add(duneLocation);
@@ -348,7 +351,7 @@
             // When
             locations.ForEach(loc =>
             {
-                loc.Output = null;
+                loc.Calculation.Output = null;
                 loc.NotifyObservers();
             });
 
@@ -646,12 +649,15 @@
                     D50 = 0.000123
                 })
                 {
-                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                    Calculation =
                     {
-                        WaterLevel = 1.23,
-                        WaveHeight = 2.34,
-                        WavePeriod = 3.45
-                    })
+                        Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                        {
+                            WaterLevel = 1.23,
+                            WaveHeight = 2.34,
+                            WavePeriod = 3.45
+                        })
+                    }
                 }
             };
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs	(.../DuneLocationsExporterTest.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs	(.../DuneLocationsExporterTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -80,10 +80,10 @@
             DuneLocation locationNoOutput = CreateDuneLocationForExport(9, 9740, 1.9583e-4);
 
             DuneLocation locationUncalculatedOutput = CreateDuneLocationForExport(10, 9770.1, 1.9583e-4);
-            locationUncalculatedOutput.Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN);
+            locationUncalculatedOutput.Calculation.Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN);
 
             DuneLocation locationCalculatedOutput = CreateDuneLocationForExport(11, 9771.34, 1.337e-4);
-            locationCalculatedOutput.Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
+            locationCalculatedOutput.Calculation.Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
 
             DuneLocation[] duneLocations =
             {
@@ -121,13 +121,13 @@
             // Setup
             DuneLocation[] duneLocations =
             {
+                new TestDuneLocation(),
                 new TestDuneLocation
                 {
-                    Output = null
-                },
-                new TestDuneLocation
-                {
-                    Output = new TestDuneLocationOutput()
+                    Calculation =
+                    {
+                        Output = new TestDuneLocationOutput()
+                    }
                 }
             };
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs	(.../DuneLocationsWriterTest.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs	(.../DuneLocationsWriterTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -134,10 +134,10 @@
             DuneLocation locationNoOutput = CreateDuneLocationForExport(9, 9740, 1.9583e-4);
 
             DuneLocation locationUncalculatedOutput = CreateDuneLocationForExport(10, 9770.1, 1.9583e-4);
-            locationUncalculatedOutput.Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN);
+            locationUncalculatedOutput.Calculation.Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN);
 
             DuneLocation locationCalculatedOutput = CreateDuneLocationForExport(11, 9771.34, 1.337e-4);
-            locationCalculatedOutput.Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
+            locationCalculatedOutput.Calculation.Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
 
             DuneLocation[] duneLocations =
             {
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs	(.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs	(.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -149,7 +149,10 @@
             var initialOutput = new TestDuneLocationOutput();
             var duneLocation = new TestDuneLocation
             {
-                Output = initialOutput
+                Calculation =
+                {
+                    Output = initialOutput
+                }
             };
             var activity = new DuneErosionBoundaryCalculationActivity(duneLocation,
                                                                       validFilePath,
@@ -163,7 +166,7 @@
 
                 // Assert
                 Assert.AreEqual(ActivityState.Skipped, activity.State);
-                Assert.AreSame(initialOutput, duneLocation.Output);
+                Assert.AreSame(initialOutput, duneLocation.Calculation.Output);
             }
 
             mockRepository.VerifyAll();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneLocationsViewIntegrationTest.cs
===================================================================
diff -u -r051a26d33402c4ce108bb800139393692c1aedde -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneLocationsViewIntegrationTest.cs	(.../DuneLocationsViewIntegrationTest.cs)	(revision 051a26d33402c4ce108bb800139393692c1aedde)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneLocationsViewIntegrationTest.cs	(.../DuneLocationsViewIntegrationTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -113,12 +113,15 @@
                     D50 = 0.000123
                 })
                 {
-                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                    Calculation =
                     {
-                        WaterLevel = 1.23,
-                        WaveHeight = 2.34,
-                        WavePeriod = 3.45
-                    })
+                        Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                        {
+                            WaterLevel = 1.23,
+                            WaveHeight = 2.34,
+                            WavePeriod = 3.45
+                        })
+                    }
                 }
             };
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs	(.../DuneLocationsContextExportInfoTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs	(.../DuneLocationsContextExportInfoTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -133,7 +133,10 @@
             var failureMechanism = new DuneErosionFailureMechanism();
             failureMechanism.DuneLocations.Add(new TestDuneLocation
             {
-                Output = new TestDuneLocationOutput()
+                Calculation =
+                {
+                    Output = new TestDuneLocationOutput()
+                }
             });
             var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs	(.../DuneErosionBoundaryCalculationActivityTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs	(.../DuneErosionBoundaryCalculationActivityTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -203,7 +203,10 @@
             // Setup
             var duneLocation = new TestDuneLocation("locationName")
             {
-                Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties())
+                Calculation =
+                {
+                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties())
+                }
             };
 
             var activity = new DuneErosionBoundaryCalculationActivity(duneLocation,
@@ -255,7 +258,7 @@
             }
 
             // Assert
-            DuneLocationOutput duneLocationOutput = duneLocation.Output;
+            DuneLocationOutput duneLocationOutput = duneLocation.Calculation.Output;
             Assert.IsNotNull(duneLocationOutput);
             Assert.AreEqual(expectedWaterLevel, duneLocationOutput.WaterLevel, duneLocationOutput.WaterLevel.GetAccuracy());
             Assert.AreEqual(expectedWaveHeight, duneLocationOutput.WaveHeight, duneLocationOutput.WaveHeight.GetAccuracy());
@@ -342,7 +345,7 @@
                     CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
                 });
 
-                Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, duneLocation.Output.CalculationConvergence);
+                Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, duneLocation.Calculation.Output.CalculationConvergence);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -232,7 +232,7 @@
                                                 });
 
             // Precondition
-            Assert.IsNull(duneLocation.Output);
+            Assert.IsNull(duneLocation.Calculation.Output);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -258,14 +258,14 @@
                 double targetReliability = StatisticsConverter.ProbabilityToReliability(mechanismSpecificNorm);
                 double calculatedProbability = StatisticsConverter.ReliabilityToProbability(calculator.ReliabilityIndex);
 
-                Assert.IsNotNull(duneLocation.Output);
-                Assert.AreEqual(calculator.ReliabilityIndex, duneLocation.Output.CalculatedReliability.Value);
-                Assert.AreEqual(calculatedProbability, duneLocation.Output.CalculatedProbability);
-                Assert.AreEqual(mechanismSpecificNorm, duneLocation.Output.TargetProbability);
-                Assert.AreEqual(targetReliability, duneLocation.Output.TargetReliability, duneLocation.Output.TargetReliability.GetAccuracy());
-                Assert.AreEqual(calculator.WaterLevel, duneLocation.Output.WaterLevel, duneLocation.Output.WaterLevel.GetAccuracy());
-                Assert.AreEqual(calculator.WaveHeight, duneLocation.Output.WaveHeight, duneLocation.Output.WaveHeight.GetAccuracy());
-                Assert.AreEqual(calculator.WavePeriod, duneLocation.Output.WavePeriod, duneLocation.Output.WavePeriod.GetAccuracy());
+                Assert.IsNotNull(duneLocation.Calculation.Output);
+                Assert.AreEqual(calculator.ReliabilityIndex, duneLocation.Calculation.Output.CalculatedReliability.Value);
+                Assert.AreEqual(calculatedProbability, duneLocation.Calculation.Output.CalculatedProbability);
+                Assert.AreEqual(mechanismSpecificNorm, duneLocation.Calculation.Output.TargetProbability);
+                Assert.AreEqual(targetReliability, duneLocation.Calculation.Output.TargetReliability, duneLocation.Calculation.Output.TargetReliability.GetAccuracy());
+                Assert.AreEqual(calculator.WaterLevel, duneLocation.Calculation.Output.WaterLevel, duneLocation.Calculation.Output.WaterLevel.GetAccuracy());
+                Assert.AreEqual(calculator.WaveHeight, duneLocation.Calculation.Output.WaveHeight, duneLocation.Calculation.Output.WaveHeight.GetAccuracy());
+                Assert.AreEqual(calculator.WavePeriod, duneLocation.Calculation.Output.WavePeriod, duneLocation.Calculation.Output.WavePeriod.GetAccuracy());
             }
 
             mockRepository.VerifyAll();
@@ -437,7 +437,7 @@
                         CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
                     });
                 Assert.IsTrue(exceptionThrown);
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
 
             mockRepository.VerifyAll();
@@ -507,7 +507,7 @@
                         CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
                     });
                 Assert.IsTrue(exceptionThrown);
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
 
             mockRepository.VerifyAll();
@@ -580,7 +580,7 @@
                         CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
                     });
                 Assert.IsTrue(exceptionThrown);
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
                 Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage);
             }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs	(.../DuneErosionDataSynchronizationServiceTest.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs	(.../DuneErosionDataSynchronizationServiceTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -231,7 +231,10 @@
             // Setup
             var location = new TestDuneLocation
             {
-                Output = new TestDuneLocationOutput()
+                Calculation =
+                {
+                    Output = new TestDuneLocationOutput()
+                }
             };
 
             // Call
@@ -242,7 +245,7 @@
                 });
 
             // Assert
-            Assert.IsNull(location.Output);
+            Assert.IsNull(location.Calculation.Output);
             CollectionAssert.AreEqual(
                 new[]
                 {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs
===================================================================
diff -u -r97a0522a94ad88d0087d737fcda84c2f3fe0ee7c -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision 97a0522a94ad88d0087d737fcda84c2f3fe0ee7c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -196,7 +196,7 @@
 
             DuneLocation[] duneLocationWithOutput = assessmentSection.GetFailureMechanisms().OfType<DuneErosionFailureMechanism>()
                                                                      .SelectMany(f => f.DuneLocations)
-                                                                     .Where(loc => loc.Output != null)
+                                                                     .Where(loc => loc.Calculation.Output != null)
                                                                      .ToArray();
 
             HydraulicBoundaryLocation[] hblWithOutput = assessmentSection.GetFailureMechanisms().OfType<GrassCoverErosionOutwardsFailureMechanism>()
@@ -214,7 +214,7 @@
             Assert.True(calculationsWithOutput.All(c => c.HasOutput),
                         "All calculations that had output still have them.");
 
-            Assert.True(duneLocationWithOutput.All(loc => loc.Output != null));
+            Assert.True(duneLocationWithOutput.All(loc => loc.Calculation.Output != null));
             Assert.True(hblWithOutput.All(loc => loc.DesignWaterLevelCalculation.HasOutput || loc.WaveHeightCalculation.HasOutput));
 
             CollectionAssert.IsEmpty(affectedObjects);
@@ -248,7 +248,7 @@
                 .ToList();
 
             IEnumerable<IObservable> expectedAffectedObjects =
-                duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Output != null).Cast<IObservable>()
+                duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Calculation.Output != null).Cast<IObservable>()
                                            .Concat(grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations)
                                            .Concat(new IObservable[]
                                            {
@@ -284,7 +284,7 @@
             }
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
             mocks.VerifyAll();
         }
@@ -313,7 +313,7 @@
                                                                                    .Where(calc => calc.HasOutput)
                                                                                    .ToList();
 
-            IEnumerable<IObservable> expectedAffectedObjects = duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Output != null)
+            IEnumerable<IObservable> expectedAffectedObjects = duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Calculation.Output != null)
                                                                                           .Concat(new IObservable[]
                                                                                           {
                                                                                               assessmentSection
@@ -343,7 +343,7 @@
 
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
             mocks.VerifyAll();
         }
@@ -370,7 +370,7 @@
                                                                                        .Single();
 
             IEnumerable<IObservable> expectedAffectedObjects =
-                duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Output != null).Cast<IObservable>()
+                duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Calculation.Output != null).Cast<IObservable>()
                                            .Concat(grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations)
                                            .Concat(new IObservable[]
                                            {
@@ -401,7 +401,7 @@
             }
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
             mocks.VerifyAll();
         }
@@ -423,7 +423,7 @@
                                                                                        .OfType<DuneErosionFailureMechanism>()
                                                                                        .Single();
 
-            IEnumerable<IObservable> expectedAffectedObjects = duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Output != null)
+            IEnumerable<IObservable> expectedAffectedObjects = duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Calculation.Output != null)
                                                                                           .Concat(new IObservable[]
                                                                                           {
                                                                                               assessmentSection
@@ -450,7 +450,7 @@
             }
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs
===================================================================
diff -u -r97a0522a94ad88d0087d737fcda84c2f3fe0ee7c -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision 97a0522a94ad88d0087d737fcda84c2f3fe0ee7c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -134,7 +134,7 @@
                                             .Concat(assessmentSection.GetFailureMechanisms())
                                             .Concat(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)
                                             .Concat(assessmentSection.HydraulicBoundaryDatabase.Locations)
-                                            .Concat(assessmentSection.DuneErosion.DuneLocations.Where(dl => dl.Output != null))
+                                            .Concat(assessmentSection.DuneErosion.DuneLocations.Where(dl => dl.Calculation.Output != null))
                                             .Concat(new IObservable[]
                                             {
                                                 assessmentSection.FailureMechanismContribution
@@ -166,7 +166,7 @@
             }
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
             CollectionAssert.AreEquivalent(expectedAffectedObjects, affectedObjects);
         }
@@ -187,7 +187,7 @@
                 assessmentSection.GetFailureMechanisms().Cast<IObservable>()
                                  .Concat(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)
                                  .Concat(assessmentSection.HydraulicBoundaryDatabase.Locations)
-                                 .Concat(assessmentSection.DuneErosion.DuneLocations.Where(dl => dl.Output != null))
+                                 .Concat(assessmentSection.DuneErosion.DuneLocations.Where(dl => dl.Calculation.Output != null))
                                  .Concat(new IObservable[]
                                  {
                                      assessmentSection.FailureMechanismContribution
@@ -211,7 +211,7 @@
             }
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
-                Assert.IsNull(duneLocation.Output);
+                Assert.IsNull(duneLocation.Calculation.Output);
             }
             CollectionAssert.AreEquivalent(expectedAffectedObjects, affectedObjects);
         }
@@ -303,7 +303,7 @@
                 Assert.IsTrue(location.DesignWaterLevelCalculation.HasOutput);
                 Assert.IsTrue(location.WaveHeightCalculation.HasOutput);
             }
-            Assert.IsNotNull(assessmentSection.DuneErosion.DuneLocations[1].Output);
+            Assert.IsNotNull(assessmentSection.DuneErosion.DuneLocations[1].Calculation.Output);
             CollectionAssert.IsEmpty(affectedObjects);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r97a0522a94ad88d0087d737fcda84c2f3fe0ee7c -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 97a0522a94ad88d0087d737fcda84c2f3fe0ee7c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -328,7 +328,7 @@
             {
                 expectedAffectedItems.Add(grassCoverErosionLocation);
             }
-            if (duneLocation.Output != null)
+            if (duneLocation.Calculation.Output != null)
             {
                 expectedAffectedItems.Add(duneLocation);
             }
@@ -342,7 +342,7 @@
             CollectionAssert.AreEquivalent(expectedAffectedItems, affectedObjects);
             Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation.HasOutput);
             Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation.HasOutput);
-            Assert.IsNull(duneLocation.Output);
+            Assert.IsNull(duneLocation.Calculation.Output);
 
             mockRepository.VerifyAll();
         }
@@ -392,7 +392,7 @@
             {
                 expectedAffectedItems.Add(grassCoverErosionLocation);
             }
-            if (duneLocation.Output != null)
+            if (duneLocation.Calculation.Output != null)
             {
                 expectedAffectedItems.Add(duneLocation);
             }
@@ -410,7 +410,7 @@
             CollectionAssert.AreEquivalent(expectedAffectedItems, affectedObjects);
             Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation.HasOutput);
             Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation.HasOutput);
-            Assert.IsNull(duneLocation.Output);
+            Assert.IsNull(duneLocation.Calculation.Output);
         }
 
         [Test]
@@ -452,7 +452,7 @@
             {
                 expectedAffectedItems.Add(grassCoverErosionLocation);
             }
-            if (duneLocation.Output != null)
+            if (duneLocation.Calculation.Output != null)
             {
                 expectedAffectedItems.Add(duneLocation);
             }
@@ -468,7 +468,7 @@
             Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation.HasOutput);
             Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation.HasOutput);
             Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation.HasOutput);
-            Assert.IsNull(duneLocation.Output);
+            Assert.IsNull(duneLocation.Calculation.Output);
 
             mockRepository.VerifyAll();
         }
@@ -1624,14 +1624,20 @@
                 new TestHydraulicBoundaryLocation(),
                 new TestDuneLocation
                 {
-                    Output = new TestDuneLocationOutput()
+                    Calculation =
+                    {
+                        Output = new TestDuneLocationOutput()
+                    }
                 }
             ).SetName($"GrassLocationWithoutOutputDuneLocationWithOutput_{testName}");
             yield return new TestCaseData(
                 TestHydraulicBoundaryLocation.CreateFullyCalculated(),
                 new TestDuneLocation
                 {
-                    Output = new TestDuneLocationOutput()
+                    Calculation =
+                    {
+                        Output = new TestDuneLocationOutput()
+                    }
                 }
             ).SetName($"GrassAndDuneLocationWithOutput_{testName}");
         }
@@ -1645,7 +1651,10 @@
                     new TestHydraulicBoundaryLocation(),
                     new TestDuneLocation
                     {
-                        Output = new TestDuneLocationOutput()
+                        Calculation =
+                        {
+                            Output = new TestDuneLocationOutput()
+                        }
                     }
                 ).SetName("HydraulicBoundaryAndDuneLocationWithOutput");
                 yield return new TestCaseData(
@@ -1658,7 +1667,10 @@
                     TestHydraulicBoundaryLocation.CreateFullyCalculated(),
                     new TestDuneLocation
                     {
-                        Output = new TestDuneLocationOutput()
+                        Calculation =
+                        {
+                            Output = new TestDuneLocationOutput()
+                        }
                     }
                 ).SetName("AllTypesWithOutput");
                 yield return new TestCaseData(
@@ -1671,7 +1683,10 @@
                     new TestHydraulicBoundaryLocation(),
                     new TestDuneLocation
                     {
-                        Output = new TestDuneLocationOutput()
+                        Calculation =
+                        {
+                            Output = new TestDuneLocationOutput()
+                        }
                     }
                 ).SetName("HydraulicBoundaryLocationWithoutOutputDuneLocationWithOutput");
                 yield return new TestCaseData(
@@ -1684,7 +1699,10 @@
                     TestHydraulicBoundaryLocation.CreateFullyCalculated(),
                     new TestDuneLocation
                     {
-                        Output = new TestDuneLocationOutput()
+                        Calculation =
+                        {
+                            Output = new TestDuneLocationOutput()
+                        }
                     }
                 ).SetName("HydraulicBoundaryLocationWithoutOutputGrassAndDuneLocationWithOutput");
                 yield return new TestCaseData(
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs
===================================================================
diff -u -r5d822eca2d7467c9781a4a3a54d796ac4229e4a3 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 5d822eca2d7467c9781a4a3a54d796ac4229e4a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -99,7 +99,7 @@
             AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection);
             Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => !(loc.DesignWaterLevelCalculation.HasOutput
                                                                                                             && loc.WaveHeightCalculation.HasOutput)));
-            Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Output == null));
+            Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Calculation.Output == null));
         }
 
         [Test]
@@ -117,7 +117,7 @@
             AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection);
             Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => !(loc.DesignWaterLevelCalculation.HasOutput
                                                                                                             && loc.WaveHeightCalculation.HasOutput)));
-            Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Output == null));
+            Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Calculation.Output == null));
         }
 
         [Test]
@@ -644,12 +644,12 @@
 
         private static void AssertDuneErosionFailureMechanismCalculationConfigurationsWithOutputs(DuneErosionFailureMechanism failureMechanism)
         {
-            Assert.True(failureMechanism.DuneLocations.Any(dl => dl.Output != null));
+            Assert.True(failureMechanism.DuneLocations.Any(dl => dl.Calculation.Output != null));
         }
 
         private static void AssertDuneErosionFailureMechanismCalculationConfigurationsWithoutOutputs(DuneErosionFailureMechanism failureMechanism)
         {
-            Assert.True(failureMechanism.DuneLocations.Any(dl => dl.Output == null));
+            Assert.True(failureMechanism.DuneLocations.Any(dl => dl.Calculation.Output == null));
         }
 
         #endregion
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64 -rb0e228408016f88b94ac63d6896e5bc7668a75c1
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision b0e228408016f88b94ac63d6896e5bc7668a75c1)
@@ -105,12 +105,12 @@
         /// Gets a fully configured <see cref="AssessmentSection"/> with a desired <see cref="AssessmentSectionComposition"/> and 
         /// possible configurations of the parent and nested calculations, but without the output of the 
         /// <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>, <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/> 
-        /// and <see cref="DuneLocation.Output"/>.
+        /// and <see cref="DuneLocation.Calculation"/>.
         /// </summary>
         /// <param name="composition">The desired <see cref="AssessmentSectionComposition"/> to initialize the <see cref="AssessmentSection"/> with.</param>
         /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible calculation configurations of the parent and 
-        /// nested calculations inside the failure mechanisms, but without the output of the <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>
-        /// , <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/> and <see cref="DuneLocation.Output"/>.</returns>
+        /// nested calculations inside the failure mechanisms, but without the output of the <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>,
+        /// <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/> and <see cref="DuneLocation.Calculation"/>.</returns>
         public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput(
             AssessmentSectionComposition composition = AssessmentSectionComposition.Dike)
         {
@@ -1019,12 +1019,15 @@
                                                               D50 = 0.00008
                                                           })
             {
-                Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                Calculation =
                 {
-                    WaterLevel = hydraulicBoundaryLocation.DesignWaterLevel + 0.2,
-                    WaveHeight = hydraulicBoundaryLocation.WaveHeight + 0.3,
-                    WavePeriod = 10
-                })
+                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+                    {
+                        WaterLevel = hydraulicBoundaryLocation.DesignWaterLevel + 0.2,
+                        WaveHeight = hydraulicBoundaryLocation.WaveHeight + 0.3,
+                        WavePeriod = 10
+                    })
+                }
             };
 
             failureMechanism.DuneLocations.Add(duneLocation);