Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightCalculationsContext.cs
===================================================================
diff -u -r466a02f3ba52351117297fcc1ea2d4242ab92b39 -r7c2e84eb2f2e6ce8c844878439bb15e4d0cee9c1
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightCalculationsContext.cs	(.../WaveHeightCalculationsContext.cs)	(revision 466a02f3ba52351117297fcc1ea2d4242ab92b39)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightCalculationsContext.cs	(.../WaveHeightCalculationsContext.cs)	(revision 7c2e84eb2f2e6ce8c844878439bb15e4d0cee9c1)
@@ -31,7 +31,7 @@
     /// Presentation object for all data required to configure an enumeration of <see cref="HydraulicBoundaryLocationCalculation"/>
     /// with a wave height calculation result.
     /// </summary>
-    public class WaveHeightCalculationsContext : ObservableWrappedObjectContextBase<ObservableList<HydraulicBoundaryLocationCalculation>>
+    public class WaveHeightCalculationsContext : ObservableWrappedObjectContextBase<IObservableEnumerable<HydraulicBoundaryLocationCalculation>>
     {
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightCalculationsContext"/>.
@@ -43,7 +43,7 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedData"/>, <paramref name="assessmentSection"/> or
         /// <paramref name="getNormFunc"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
-        public WaveHeightCalculationsContext(ObservableList<HydraulicBoundaryLocationCalculation> wrappedData,
+        public WaveHeightCalculationsContext(IObservableEnumerable<HydraulicBoundaryLocationCalculation> wrappedData,
                                              IAssessmentSection assessmentSection,
                                              Func<double> getNormFunc,
                                              string categoryBoundaryName)
@@ -84,7 +84,7 @@
         /// </summary>
         public string CategoryBoundaryName { get; }
 
-        public override bool Equals(WrappedObjectContextBase<ObservableList<HydraulicBoundaryLocationCalculation>> other)
+        public override bool Equals(WrappedObjectContextBase<IObservableEnumerable<HydraulicBoundaryLocationCalculation>> other)
         {
             return base.Equals(other)
                    && other is WaveHeightCalculationsContext
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightCalculationsContextTest.cs
===================================================================
diff -u -rf8f82b94a5b6a3a47b2b32fc1a8ab704b33f356b -r7c2e84eb2f2e6ce8c844878439bb15e4d0cee9c1
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightCalculationsContextTest.cs	(.../WaveHeightCalculationsContextTest.cs)	(revision f8f82b94a5b6a3a47b2b32fc1a8ab704b33f356b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightCalculationsContextTest.cs	(.../WaveHeightCalculationsContextTest.cs)	(revision 7c2e84eb2f2e6ce8c844878439bb15e4d0cee9c1)
@@ -54,7 +54,7 @@
                                                             categoryBoundaryName);
 
             // Assert
-            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableList<HydraulicBoundaryLocationCalculation>>>(context);
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IObservableEnumerable<HydraulicBoundaryLocationCalculation>>>(context);
             Assert.AreSame(calculations, context.WrappedData);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(getNormFunc, context.GetNormFunc);
@@ -140,7 +140,7 @@
             private static readonly MockRepository mocks = new MockRepository();
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly Func<double> getNormFunc = () => 0.01;
-            private static readonly ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
+            private static readonly IObservableEnumerable<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
             private static readonly string categoryBoundaryName = "Test name";
 
             [SetUp]
@@ -183,7 +183,7 @@
 
         private class DerivedWaveHeightCalculationsContext : WaveHeightCalculationsContext
         {
-            public DerivedWaveHeightCalculationsContext(ObservableList<HydraulicBoundaryLocationCalculation> wrappedData,
+            public DerivedWaveHeightCalculationsContext(IObservableEnumerable<HydraulicBoundaryLocationCalculation> wrappedData,
                                                         IAssessmentSection assessmentSection,
                                                         Func<double> getNormFunc,
                                                         string categoryBoundaryName)