Index: Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs
===================================================================
diff -u -r7710a5b982ae6a70d740a6d2af8200560ec37f68 -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d
--- Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs	(.../WrappedObjectContextBase.cs)	(revision 7710a5b982ae6a70d740a6d2af8200560ec37f68)
+++ Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs	(.../WrappedObjectContextBase.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
@@ -12,6 +12,11 @@
     /// <typeparam name="T">The object type of the wrapped instance.</typeparam>
     public abstract class WrappedObjectContextBase<T> : IObservable, IEquatable<WrappedObjectContextBase<T>> where T : IObservable
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WrappedObjectContextBase{T}"/> class.
+        /// </summary>
+        /// <param name="wrappedData">The wrapped data.</param>
+        /// <exception cref="System.ArgumentNullException">When <paramref name="wrappedData"/> is <c>null</c>.</exception>
         protected WrappedObjectContextBase(T wrappedData)
         {
             if (wrappedData == null)
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs
===================================================================
diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(.../FailureMechanismContributionContext.cs)	(revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(.../FailureMechanismContributionContext.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
@@ -21,6 +21,8 @@
 
 using System;
 using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Contribution;
 
@@ -29,88 +31,33 @@
     /// <summary>
     /// This class is a presentation object for a <see cref="FailureMechanismContribution"/> instance.
     /// </summary>
-    public sealed class FailureMechanismContributionContext : IEquatable<FailureMechanismContributionContext>, IObservable
+    public sealed class FailureMechanismContributionContext : WrappedObjectContextBase<FailureMechanismContribution>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FailureMechanismContributionContext"/> class.
         /// </summary>
         /// <param name="contribution">The contribution.</param>
         /// <param name="contributionOwner">The parent of <paramref name="contribution"/>.</param>
+        /// <exception cref="ArgumentNullException">When any input argument is null.</exception>
         public FailureMechanismContributionContext(FailureMechanismContribution contribution, IAssessmentSection contributionOwner)
+            : base(contribution)
         {
-            AssertInputsAreNotNull(contribution, contributionOwner);
+            AssertInputsAreNotNull(contributionOwner);
 
-            WrappedData = contribution;
             Parent = contributionOwner;
         }
 
         /// <summary>
-        /// Gets the concrete data instance wrapped by this context object.
+        /// Gets the assessment section to which <see cref="WrappedObjectContextBase{T}.WrappedData"/> belongs to.
         /// </summary>
-        public FailureMechanismContribution WrappedData { get; private set; }
-
-        /// <summary>
-        /// Gets the assessment section to which <see cref="WrappedData"/> belongs to.
-        /// </summary>
         public IAssessmentSection Parent { get; private set; }
 
-        private void AssertInputsAreNotNull(FailureMechanismContribution contribution, IAssessmentSection contributionOwner)
+        private void AssertInputsAreNotNull(IAssessmentSection contributionOwner)
         {
-            if (contribution == null)
-            {
-                throw new ArgumentNullException("contribution", "Failure mechanism contribution cannot be null.");
-            }
-
             if (contributionOwner == null)
             {
                 throw new ArgumentNullException("contributionOwner", "Assessment section cannot be null.");
             }
         }
-
-        #region IEquatable<FailureMechanismContributionContext>
-
-        public bool Equals(FailureMechanismContributionContext other)
-        {
-            if (ReferenceEquals(null, other))
-            {
-                return false;
-            }
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-            return WrappedData.Equals(other.WrappedData);
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as FailureMechanismContributionContext);
-        }
-
-        public override int GetHashCode()
-        {
-            return WrappedData.GetHashCode();
-        }
-
-        #endregion
-
-        #region IObservable
-
-        public void Attach(IObserver observer)
-        {
-            WrappedData.Attach(observer);
-        }
-
-        public void Detach(IObserver observer)
-        {
-            WrappedData.Detach(observer);
-        }
-
-        public void NotifyObservers()
-        {
-            WrappedData.NotifyObservers();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismSectionsContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismSectionsContext.cs	(.../FailureMechanismSectionsContext.cs)	(revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismSectionsContext.cs	(.../FailureMechanismSectionsContext.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
@@ -24,7 +24,6 @@
 
 using Core.Common.Base;
 
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs
===================================================================
diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(.../FailureMechanismContributionContextTest.cs)	(revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(.../FailureMechanismContributionContextTest.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
@@ -22,6 +22,7 @@
 using System;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -50,7 +51,7 @@
             var context = new FailureMechanismContributionContext(contribution, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<IEquatable<FailureMechanismContributionContext>>(context);
+            Assert.IsInstanceOf<IEquatable<WrappedObjectContextBase<FailureMechanismContribution>>>(context);
             Assert.IsInstanceOf<IObservable>(context);
             Assert.AreSame(contribution, context.WrappedData);
             Assert.AreSame(assessmentSection, context.Parent);
@@ -69,7 +70,7 @@
             TestDelegate call = () => new FailureMechanismContributionContext(null, assessmentSection);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Failure mechanism contribution cannot be null.");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Wrapped data of context cannot be null.");
             mocks.VerifyAll();
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs
===================================================================
diff -u -r0faea705e7f83205f8420c52edda8a5473485bcd -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision 0faea705e7f83205f8420c52edda8a5473485bcd)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
@@ -23,6 +23,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Data;
@@ -35,7 +37,7 @@
     /// Presentation object representing all required piping knowledge to configure and create
     /// piping related objects. It'll delegate observable behavior to the wrapped data object.
     /// </summary>
-    public abstract class PipingContext<T> : IObservable where T : IObservable
+    public abstract class PipingContext<T> : WrappedObjectContextBase<T> where T : IObservable
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PipingContext{T}"/> class.
@@ -49,11 +51,10 @@
             T wrappedData,
             IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines,
             IEnumerable<StochasticSoilModel> stochasticSoilModels,
-            IAssessmentSection assessmentSection)
+            IAssessmentSection assessmentSection) : base(wrappedData)
         {
-            AssertInputsAreNotNull(wrappedData, surfaceLines, stochasticSoilModels, assessmentSection);
+            AssertInputsAreNotNull(surfaceLines, stochasticSoilModels, assessmentSection);
 
-            WrappedData = wrappedData;
             AvailablePipingSurfaceLines = surfaceLines;
             AvailableStochasticSoilModels = stochasticSoilModels;
             AssessmentSection = assessmentSection;
@@ -88,46 +89,19 @@
         }
 
         /// <summary>
-        /// Gets the concrete data instance wrapped by this context object.
-        /// </summary>
-        public T WrappedData { get; private set; }
-
-        /// <summary>
         /// Gets the assessment section which the piping context belongs to.
         /// </summary>
         public IAssessmentSection AssessmentSection { get; private set; }
 
-        public override bool Equals(object obj)
-        {
-            var context = obj as PipingContext<T>;
-            if (context != null)
-            {
-                return WrappedData.Equals(context.WrappedData);
-            }
-            return base.Equals(obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return WrappedData.GetHashCode();
-        }
-
         /// <summary>
         /// Asserts the inputs are not null.
         /// </summary>
-        /// <param name="wrappedData">The wrapped data.</param>
         /// <param name="surfaceLines">The surface lines.</param>
         /// <param name="soilProfiles">The soil profiles.</param>
         /// <param name="assessmentSection">The assessment section.</param>
         /// <exception cref="System.ArgumentNullException">When any input parameter is null.</exception>
-        private static void AssertInputsAreNotNull(object wrappedData, object surfaceLines, object soilProfiles, object assessmentSection)
+        private static void AssertInputsAreNotNull(object surfaceLines, object soilProfiles, object assessmentSection)
         {
-            if (wrappedData == null)
-            {
-                var message = String.Format(Resources.PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.PipingContext_DataDescription_WrappedData);
-                throw new ArgumentNullException("wrappedData", message);
-            }
             if (surfaceLines == null)
             {
                 var message = String.Format(Resources.PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
@@ -147,24 +121,5 @@
                 throw new ArgumentNullException("assessmentSection", message);
             }
         }
-
-        #region IObservable
-
-        public void Attach(IObserver observer)
-        {
-            WrappedData.Attach(observer);
-        }
-
-        public void Detach(IObserver observer)
-        {
-            WrappedData.Detach(observer);
-        }
-
-        public void NotifyObservers()
-        {
-            WrappedData.NotifyObservers();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs
===================================================================
diff -u -r614c1aa4bf54ed2852d93a58ba8d49b549d5f46c -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs	(.../PipingContextTest.cs)	(revision 614c1aa4bf54ed2852d93a58ba8d49b549d5f46c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs	(.../PipingContextTest.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
@@ -91,7 +91,7 @@
             {
                 Environment.NewLine
             }, StringSplitOptions.None)[0];
-            Assert.AreEqual("Het piping data object mag niet 'null' zijn.", customMessage);
+            Assert.AreEqual("Wrapped data of context cannot be null.", customMessage);
             mocks.VerifyAll();
         }