Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext.cs
===================================================================
diff -u -ra016a24b89f1930ed6dd4339c1c57226aeefda4d -rfa5bb22f946712b854b0762ad126ed5f0cb7ceef
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext.cs	(.../HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext.cs)	(revision a016a24b89f1930ed6dd4339c1c57226aeefda4d)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext.cs	(.../HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext.cs)	(revision fa5bb22f946712b854b0762ad126ed5f0cb7ceef)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Controls.PresentationObjects;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
 
@@ -29,7 +28,8 @@
     /// <summary>
     /// Presentation object for all hydraulic boundary location calculations based on a user defined target probability.
     /// </summary>
-    public abstract class HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext : ObservableWrappedObjectContextBase<HydraulicBoundaryLocationCalculationsForTargetProbability>
+    public abstract class HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext
+        : LocationCalculationsContext<HydraulicBoundaryLocationCalculationsForTargetProbability, HydraulicBoundaryLocationCalculationsForTargetProbability>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext"/>.
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/LocationCalculationsContext.cs
===================================================================
diff -u -rd62ce4fd4a3a7e3e43f2d45aa52822f94f74afd9 -rfa5bb22f946712b854b0762ad126ed5f0cb7ceef
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/LocationCalculationsContext.cs	(.../LocationCalculationsContext.cs)	(revision d62ce4fd4a3a7e3e43f2d45aa52822f94f74afd9)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/LocationCalculationsContext.cs	(.../LocationCalculationsContext.cs)	(revision fa5bb22f946712b854b0762ad126ed5f0cb7ceef)
@@ -33,8 +33,7 @@
     /// </summary>
     /// <typeparam name="TWrappedData">The object type of the wrapped instance.</typeparam>
     /// <typeparam name="TObservable">The object type of the instances that effect the unique identification.</typeparam>
-    public abstract class LocationCalculationsContext<TWrappedData, TObservable>
-        : WrappedObjectContextBase<TWrappedData>, IObservable
+    public abstract class LocationCalculationsContext<TWrappedData, TObservable> : WrappedObjectContextBase<TWrappedData>, IObservable
         where TObservable : class, IObservable
     {
         private readonly Collection<IObserver> observers = new Collection<IObserver>();
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/WaterLevelCalculationsForUserDefinedTargetProbabilityContext.cs
===================================================================
diff -u -ra016a24b89f1930ed6dd4339c1c57226aeefda4d -rfa5bb22f946712b854b0762ad126ed5f0cb7ceef
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/WaterLevelCalculationsForUserDefinedTargetProbabilityContext.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContext.cs)	(revision a016a24b89f1930ed6dd4339c1c57226aeefda4d)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/WaterLevelCalculationsForUserDefinedTargetProbabilityContext.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContext.cs)	(revision fa5bb22f946712b854b0762ad126ed5f0cb7ceef)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.Base;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
 
@@ -39,5 +40,7 @@
         public WaterLevelCalculationsForUserDefinedTargetProbabilityContext(HydraulicBoundaryLocationCalculationsForTargetProbability wrappedData,
                                                                             IAssessmentSection assessmentSection)
             : base(wrappedData, assessmentSection) {}
+
+        protected override ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability> LocationCalculationsListToObserve => AssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities;
     }
 }
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/WaveHeightCalculationsForUserDefinedTargetProbabilityContext.cs
===================================================================
diff -u -ra016a24b89f1930ed6dd4339c1c57226aeefda4d -rfa5bb22f946712b854b0762ad126ed5f0cb7ceef
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/WaveHeightCalculationsForUserDefinedTargetProbabilityContext.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContext.cs)	(revision a016a24b89f1930ed6dd4339c1c57226aeefda4d)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/WaveHeightCalculationsForUserDefinedTargetProbabilityContext.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContext.cs)	(revision fa5bb22f946712b854b0762ad126ed5f0cb7ceef)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.Base;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
 
@@ -39,5 +40,7 @@
         public WaveHeightCalculationsForUserDefinedTargetProbabilityContext(HydraulicBoundaryLocationCalculationsForTargetProbability wrappedData,
                                                                             IAssessmentSection assessmentSection)
             : base(wrappedData, assessmentSection) {}
+
+        protected override ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability> LocationCalculationsListToObserve => AssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities;
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs
===================================================================
diff -u -rd22318d66f73e412d80e69398a515c9347f25c8e -rfa5bb22f946712b854b0762ad126ed5f0cb7ceef
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs	(.../HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs)	(revision d22318d66f73e412d80e69398a515c9347f25c8e)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs	(.../HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs)	(revision fa5bb22f946712b854b0762ad126ed5f0cb7ceef)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Controls.PresentationObjects;
+using Core.Common.Base;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
@@ -59,7 +59,7 @@
                 calculationsForTargetProbability, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<HydraulicBoundaryLocationCalculationsForTargetProbability>>(context);
+            Assert.IsInstanceOf<LocationCalculationsContext<HydraulicBoundaryLocationCalculationsForTargetProbability, HydraulicBoundaryLocationCalculationsForTargetProbability>>(context);
             Assert.AreSame(calculationsForTargetProbability, context.WrappedData);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             mockRepository.VerifyAll();
@@ -71,6 +71,9 @@
             public TestHydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilityContext(
                 HydraulicBoundaryLocationCalculationsForTargetProbability wrappedData, IAssessmentSection assessmentSection)
                 : base(wrappedData, assessmentSection) {}
+
+            protected override ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability> LocationCalculationsListToObserve { get; }
+                = new ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability>();
         }
     }
 }
\ No newline at end of file