Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -r71fda574a476b830bd4b767b624fb52426658701 -rf74c65d0ad7a4658f8a87a0beace37735b3ce749
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 71fda574a476b830bd4b767b624fb52426658701)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision f74c65d0ad7a4658f8a87a0beace37735b3ce749)
@@ -93,7 +93,7 @@
             {
                 Text = context => RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ForeColor = context => context.WrappedData.Count > 0
+                ForeColor = context => context.WrappedData.Any()
                                            ? Color.FromKnownColor(KnownColor.ControlText)
                                            : Color.FromKnownColor(KnownColor.GrayText),
                 ContextMenuStrip = DuneLocationsContextMenuStrip
@@ -145,7 +145,7 @@
             {
                 Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName,
                 CreateFileExporter = (context, filePath) => new DuneLocationsExporter(context.WrappedData, filePath),
-                IsEnabled = context => context.WrappedData.Any(dl => dl.Calculation.Output != null),
+                IsEnabled = context => context.WrappedData.Any(calculation => calculation.Output != null),
                 FileFilterGenerator = new FileFilterGenerator(
                     Resources.DuneErosionPlugin_GetExportInfos_MorphAn_boundary_conditions_file_filter_Extension,
                     Resources.DuneErosionPlugin_GetExportInfos_MorphAn_boundary_conditions_file_filter_Description)
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs
===================================================================
diff -u -r71fda574a476b830bd4b767b624fb52426658701 -rf74c65d0ad7a4658f8a87a0beace37735b3ce749
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs	(.../DuneLocationsContextExportInfoTest.cs)	(revision 71fda574a476b830bd4b767b624fb52426658701)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs	(.../DuneLocationsContextExportInfoTest.cs)	(revision f74c65d0ad7a4658f8a87a0beace37735b3ce749)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Linq;
+using Core.Common.Base;
 using Core.Common.Base.IO;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
@@ -65,8 +66,9 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
+            var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(), 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
             using (var plugin = new DuneErosionPlugin())
             {
@@ -98,16 +100,20 @@
         }
 
         [Test]
-        public void IsEnabled_LocationsWithoutOutput_ReturnFalse()
+        public void IsEnabled_CalculationsWithoutOutput_ReturnFalse()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
-            failureMechanism.DuneLocations.Add(new TestDuneLocation());
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
+            {
+                new DuneLocationCalculation(new TestDuneLocation())
+            };
+            var context = new DuneLocationCalculationsContext(duneLocationCalculations, 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
             using (var plugin = new DuneErosionPlugin())
             {
@@ -123,22 +129,23 @@
         }
 
         [Test]
-        public void IsEnabled_LocationsWithOutput_ReturnTrue()
+        public void IsEnabled_CalculationsWithOutput_ReturnTrue()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
-            failureMechanism.DuneLocations.Add(new TestDuneLocation
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
             {
-                Calculation =
+                new DuneLocationCalculation(new TestDuneLocation())
                 {
                     Output = new TestDuneLocationOutput()
                 }
-            });
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
+            };
+            var context = new DuneLocationCalculationsContext(duneLocationCalculations, 
+                                                              new DuneErosionFailureMechanism(),
+                                                              assessmentSection);
 
             using (var plugin = new DuneErosionPlugin())
             {
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -r71fda574a476b830bd4b767b624fb52426658701 -rf74c65d0ad7a4658f8a87a0beace37735b3ce749
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs	(.../DuneLocationsContextPropertyInfoTest.cs)	(revision 71fda574a476b830bd4b767b624fb52426658701)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs	(.../DuneLocationsContextPropertyInfoTest.cs)	(revision f74c65d0ad7a4658f8a87a0beace37735b3ce749)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Linq;
+using Core.Common.Base;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
 using NUnit.Framework;
@@ -57,9 +58,9 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations,
-                                                   failureMechanism, assessmentSection);
+            var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(), 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
             using (var plugin = new DuneErosionPlugin())
             {
@@ -72,6 +73,7 @@
                 Assert.IsInstanceOf<DuneLocationsProperties>(objectProperties);
                 Assert.AreSame(context.WrappedData, objectProperties.Data);
             }
+
             mockRepository.VerifyAll();
         }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs
===================================================================
diff -u -r71fda574a476b830bd4b767b624fb52426658701 -rf74c65d0ad7a4658f8a87a0beace37735b3ce749
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs	(.../DuneLocationsViewInfoTest.cs)	(revision 71fda574a476b830bd4b767b624fb52426658701)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs	(.../DuneLocationsViewInfoTest.cs)	(revision f74c65d0ad7a4658f8a87a0beace37735b3ce749)
@@ -107,15 +107,15 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
+            var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(), 
+                                                              new DuneErosionFailureMechanism(),
+                                                              assessmentSection);
 
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
-
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
-            Assert.AreSame(failureMechanism.DuneLocations, viewData);
+            Assert.AreSame(context.WrappedData, viewData);
             mocks.VerifyAll();
         }
 
@@ -127,10 +127,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
+            var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(), 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
-
             // Call
             bool additionalDataCheck = info.AdditionalDataCheck(context);
 
@@ -146,10 +146,14 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
-            failureMechanism.DuneLocations.Add(new TestDuneLocation());
+            var duneLocations = new ObservableList<DuneLocationCalculation>
+            {
+                new DuneLocationCalculation(new TestDuneLocation())
+            };
 
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
+            var context = new DuneLocationCalculationsContext(duneLocations, 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
             // Call
             bool additionalDataCheck = info.AdditionalDataCheck(context);
@@ -171,7 +175,7 @@
 
             var failureMechanism = new DuneErosionFailureMechanism();
             var context = new DuneLocationCalculationsContext(
-                new ObservableList<DuneLocation>(),
+                new ObservableList<DuneLocationCalculation>(),
                 failureMechanism,
                 assessmentSection);
 
@@ -201,7 +205,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new DuneErosionFailureMechanism();
-            var locations = new ObservableList<DuneLocation>();
+            var locations = new ObservableList<DuneLocationCalculation>();
 
             var data = new DuneLocationCalculationsContext(
                 locations,