Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSectionComposition.cs
===================================================================
diff -u -r2389ee6ea48d7014101ea90df5db340b44407c12 -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSectionComposition.cs	(.../AssessmentSectionComposition.cs)	(revision 2389ee6ea48d7014101ea90df5db340b44407c12)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSectionComposition.cs	(.../AssessmentSectionComposition.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -1,4 +1,25 @@
-namespace Ringtoets.Common.Data
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Common.Data
 {
     /// <summary>
     /// Describes the configuration of an <see cref="IAssessmentSection"/>.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -0,0 +1,118 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+using Core.Common.Base;
+
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Contribution;
+
+namespace Ringtoets.Common.Forms.PresentationObjects
+{
+    /// <summary>
+    /// This class is a presentation object for a <see cref="FailureMechanismContribution"/> instance.
+    /// </summary>
+    public sealed class FailureMechanismContributionContext : IEquatable<FailureMechanismContributionContext>, IObservable
+    {
+        /// <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>
+        public FailureMechanismContributionContext(FailureMechanismContribution contribution, IAssessmentSection contributionOwner)
+        {
+            AssertInputsAreNotNull(contribution, contributionOwner);
+
+            WrappedData = contribution;
+            Parent = contributionOwner;
+        }
+
+        /// <summary>
+        /// Gets the concrete data instance wrapped by this context object.
+        /// </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)
+        {
+            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/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r504f726111ede24adc838a345fdcd1c47227c79b -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -48,6 +48,7 @@
     <Compile Include="PresentationObjects\FailureMechanismContext.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="PresentationObjects\FailureMechanismContributionContext.cs" />
     <Compile Include="PresentationObjects\FailureMechanismSectionResultContext.cs" />
     <Compile Include="PresentationObjects\FailureMechanismSectionsContext.cs" />
     <Compile Include="PresentationObjects\ReferenceLineContext.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -0,0 +1,279 @@
+using System;
+using System.Linq;
+
+using Core.Common.Base;
+using Core.Common.TestUtil;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Forms.PresentationObjects;
+
+namespace Ringtoets.Common.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class FailureMechanismContributionContextTest
+    {
+        [Test]
+        public void Contructor_ExpectedValues()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            // Assert
+            Assert.IsInstanceOf<IEquatable<FailureMechanismContributionContext>>(context);
+            Assert.IsInstanceOf<IObservable>(context);
+            Assert.AreSame(contribution, context.WrappedData);
+            Assert.AreSame(assessmentSection, context.Parent);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Contructor_FailureMechanismContributionIsNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new FailureMechanismContributionContext(null, assessmentSection);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Failure mechanism contribution cannot be null.");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Contructor_AssessmentSectionIsNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+
+            // Call
+            TestDelegate call = () => new FailureMechanismContributionContext(contribution, null);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Assessment section cannot be null.");
+        }
+
+        [Test]
+        public void Equals_ToNull_ReturnFalse()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            // Call
+            bool isEqual = context.Equals(null);
+
+            // Assert
+            Assert.IsFalse(isEqual);
+        }
+
+        [Test]
+        public void Equals_ToDifferentObjectType_ReturnFalse()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+            object differentObject = new object();
+
+            // Call
+            bool isEqual1 = context.Equals(differentObject);
+            bool isEqual2 = differentObject.Equals(context);
+
+            // Assert
+            Assert.IsFalse(isEqual1);
+            Assert.IsFalse(isEqual2);
+        }
+
+        [Test]
+        public void Equals_ToEqualObject_ReturnTrue()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context1 = new FailureMechanismContributionContext(contribution, assessmentSection);
+            object context2 = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            // Call
+            bool isEqual1 = context1.Equals(context2);
+            bool isEqual2 = context2.Equals(context1);
+
+            // Assert
+            Assert.IsTrue(isEqual1);
+            Assert.IsTrue(isEqual2);
+        }
+
+        [Test]
+        public void Equals_ToInequalObject_ReturnFalse()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution1 = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+            var contribution2 = new FailureMechanismContribution(failureMechanisms, 2.2, 40000);
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context1 = new FailureMechanismContributionContext(contribution1, assessmentSection);
+            var context2 = new FailureMechanismContributionContext(contribution2, assessmentSection);
+
+            // Precondition
+            Assert.IsFalse(contribution1.Equals(contribution2));
+
+            // Call
+            bool isEqual1 = context1.Equals(context2);
+            bool isEqual2 = context2.Equals(context1);
+
+            // Assert
+            Assert.IsFalse(isEqual1);
+            Assert.IsFalse(isEqual2);
+        }
+
+        [Test]
+        public void GetHashCode_ComparingEqualObject_ReturnEqualHashCodes()
+        {
+            // Setup
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context1 = new FailureMechanismContributionContext(contribution, assessmentSection);
+            var context2 = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            // Call
+            int hash1 = context1.GetHashCode();
+            int hash2 = context2.GetHashCode();
+
+            // Assert
+            Assert.AreEqual(hash1, hash2);
+        }
+
+        [Test]
+        public void NotifyObservers_WithAttachedObserver_UpdateObserverCalled()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 30000);
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+            context.Attach(observer);
+
+            // Call
+            context.NotifyObservers();
+
+            // Assert
+            mocks.VerifyAll(); // Expect UpdateObserver called
+        }
+
+        [Test]
+        public void NotifyObservers_WithDetachedObserver_NoUpdateObserverCalled()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+            var observer = mocks.StrictMock<IObserver>();
+            mocks.ReplayAll();
+
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 30000);
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+            context.Attach(observer);
+            context.Detach(observer);
+
+            // Call
+            context.NotifyObservers();
+
+            // Assert
+            mocks.VerifyAll(); // Expect no UpdateObserver call
+        }
+
+        [Test]
+        public void NotifyObservers_WithAttachedObserverToContribution_UpdateObserverCalled()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 30000);
+            contribution.Attach(observer);
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            // Call
+            context.NotifyObservers();
+
+            // Assert
+            mocks.VerifyAll(); // Expect UpdateObserver called
+        }
+
+        [Test]
+        public void GivenObserverAttachedToContext_WhenWrappedDataNotifiesObservers_ThenUpdateObserverCalled()
+        {
+            // Given
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 30000);
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+            context.Attach(observer);
+
+            // When
+            contribution.NotifyObservers();
+
+            // Then
+            mocks.VerifyAll(); // Expect no UpdateObserver call
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r504f726111ede24adc838a345fdcd1c47227c79b -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -61,6 +61,7 @@
     <Compile Include="PresentationObjects\AssessmentSectionCommentContextTest.cs" />
     <Compile Include="PresentationObjects\FailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\CategoryTreeFolderTest.cs" />
+    <Compile Include="PresentationObjects\FailureMechanismContributionContextTest.cs" />
     <Compile Include="PresentationObjects\FailureMechanismSectionResultContextTest.cs" />
     <Compile Include="PresentationObjects\FailureMechanismSectionsContextTest.cs" />
     <Compile Include="PresentationObjects\ReferenceLineContextTest.cs" />
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r504f726111ede24adc838a345fdcd1c47227c79b -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -50,48 +50,19 @@
         {
             Name = Resources.AssessmentSection_DisplayName;
 
-            PipingFailureMechanism = new PipingFailureMechanism
-            {
-                Contribution = 24
-            };
-            GrassErosionFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassErosionFailureMechanism_DisplayName)
-            {
-                Contribution = 24
-            };
-            MacrostabilityInwardFailureMechanism = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName)
-            {
-                Contribution = 4
-            };
-            OvertoppingFailureMechanism = new FailureMechanismPlaceholder(Resources.OvertoppingFailureMechanism_DisplayName)
-            {
-                Contribution = 2
-            };
-            ClosingFailureMechanism = new FailureMechanismPlaceholder(Resources.ClosingFailureMechanism_DisplayName)
-            {
-                Contribution = 4
-            };
-            FailingOfConstructionFailureMechanism = new FailureMechanismPlaceholder(Resources.FailingOfConstructionFailureMechanism_DisplayName)
-            {
-                Contribution = 2
-            }; 
-            StoneRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.StoneRevetmentFailureMechanism_DisplayName)
-            {
-                Contribution = 4
-            };
-            AsphaltRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName)
-            {
-                Contribution = 3
-            };
-            GrassRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassRevetmentFailureMechanism_DisplayName)
-            {
-                Contribution = 3
-            };
-            DuneErosionFailureMechanism = new FailureMechanismPlaceholder(Resources.ErosionFailureMechanism_DisplayName)
-            {
-                Contribution = 0
-            };
+            PipingFailureMechanism = new PipingFailureMechanism();
+            GrassErosionFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassErosionFailureMechanism_DisplayName);
+            MacrostabilityInwardFailureMechanism = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName);
+            OvertoppingFailureMechanism = new FailureMechanismPlaceholder(Resources.OvertoppingFailureMechanism_DisplayName);
+            ClosingFailureMechanism = new FailureMechanismPlaceholder(Resources.ClosingFailureMechanism_DisplayName);
+            FailingOfConstructionFailureMechanism = new FailureMechanismPlaceholder(Resources.FailingOfConstructionFailureMechanism_DisplayName);
+            StoneRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.StoneRevetmentFailureMechanism_DisplayName);
+            AsphaltRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName);
+            GrassRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassRevetmentFailureMechanism_DisplayName);
+            DuneErosionFailureMechanism = new FailureMechanismPlaceholder(Resources.ErosionFailureMechanism_DisplayName);
 
             FailureMechanismContribution = new FailureMechanismContribution(GetFailureMechanisms(), 30, 30000);
+            ChangeComposition(AssessmentSectionComposition.Dike);
         }
 
         /// <summary>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r2389ee6ea48d7014101ea90df5db340b44407c12 -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 2389ee6ea48d7014101ea90df5db340b44407c12)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -22,10 +22,14 @@
 using System;
 using System.Linq;
 using System.Windows.Forms;
+
 using Core.Common.Base;
 using Core.Common.Controls.Views;
 using Core.Common.Utils.Reflection;
+
 using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Forms.PresentationObjects;
+
 using CommonGuiResources = Core.Common.Gui.Properties.Resources;
 using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 
@@ -39,7 +43,7 @@
     public partial class FailureMechanismContributionView : UserControl, IView, IObserver
     {
         private DataGridViewColumn probabilityPerYearColumn;
-        private FailureMechanismContribution data;
+        private FailureMechanismContributionContext data;
 
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismContributionView"/>.
@@ -61,7 +65,7 @@
             }
             set
             {
-                HandleNewDataSet((FailureMechanismContribution) value);
+                HandleNewDataSet((FailureMechanismContributionContext)value);
             }
         }
 
@@ -99,7 +103,7 @@
         {
             if (e.ColumnIndex == probabilityPerYearColumn.Index)
             {
-                var contributionItem = data.Distribution.ElementAt(e.RowIndex);
+                var contributionItem = data.WrappedData.Distribution.ElementAt(e.RowIndex);
                 if (contributionItem.Contribution == 0.0)
                 {
                     e.Value = RingtoetsIntegrationFormsResources.FailureMechanismContributionView_ProbabilityPerYear_Not_applicable;
@@ -108,7 +112,7 @@
             }
         }
 
-        private void HandleNewDataSet(FailureMechanismContribution value)
+        private void HandleNewDataSet(FailureMechanismContributionContext value)
         {
             UnbindNormChange();
             DetachFromData();
@@ -126,7 +130,7 @@
         {
             if (data != null)
             {
-                probabilityDistributionGrid.DataSource = data.Distribution;
+                probabilityDistributionGrid.DataSource = data.WrappedData.Distribution;
             }
         }
 
@@ -168,8 +172,10 @@
 
         private void NormValueChanged(object sender, EventArgs eventArgs)
         {
-            data.Norm = Convert.ToInt32(normInput.Value);
-            data.NotifyObservers();
+            FailureMechanismContribution contribution = data.WrappedData;
+
+            contribution.Norm = Convert.ToInt32(normInput.Value);
+            contribution.NotifyObservers();
         }
 
         private void ResetTextIfEmtpy()
@@ -184,7 +190,7 @@
         {
             if (data != null)
             {
-                normInput.Value = data.Norm;
+                normInput.Value = data.WrappedData.Norm;
             }
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r48e25b3492e67a3e4f7220ed1740c0306e79f0ce -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 48e25b3492e67a3e4f7220ed1740c0306e79f0ce)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -90,7 +90,7 @@
         /// </summary>
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
-            yield return new ViewInfo<FailureMechanismContribution, FailureMechanismContributionView>
+            yield return new ViewInfo<FailureMechanismContributionContext, FailureMechanismContributionView>
             {
                 GetViewName = (v, o) => RingtoetsDataResources.FailureMechanismContribution_DisplayName,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
@@ -199,11 +199,11 @@
                 ContextMenuStrip = CategoryTreeFolderContextMenu
             };
 
-            yield return new TreeNodeInfo<FailureMechanismContribution>
+            yield return new TreeNodeInfo<FailureMechanismContributionContext>
             {
                 Text = failureMechanismContribution => RingtoetsDataResources.FailureMechanismContribution_DisplayName,
                 Image = failureMechanismContribution => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution, treeViewControl)
+                ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution.WrappedData, treeViewControl)
                                                                                                      .AddOpenItem()
                                                                                                      .AddSeparator()
                                                                                                      .AddExportItem()
@@ -240,12 +240,13 @@
             };
         }
 
-        #region FailureMechanismContribution ViewInfo
+        #region FailureMechanismContributionContext ViewInfo
 
         private static bool CloseFailureMechanismContributionViewForData(FailureMechanismContributionView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            return assessmentSection != null && assessmentSection.FailureMechanismContribution == view.Data;
+            var viewData = view.Data as FailureMechanismContributionContext;
+            return assessmentSection != null && viewData != null && assessmentSection.FailureMechanismContribution == viewData.WrappedData;
         }
 
         #endregion
@@ -288,7 +289,7 @@
             var childNodes = new List<object>
             {
                 new ReferenceLineContext(nodeData),
-                nodeData.FailureMechanismContribution,
+                new FailureMechanismContributionContext(nodeData.FailureMechanismContribution, nodeData),
                 new HydraulicBoundaryDatabaseContext(nodeData),
                 new AssessmentSectionCommentContext(nodeData)
             };
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r7db7e1072b32065cdfa7c9b110fb62e3da9b44fa -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 7db7e1072b32065cdfa7c9b110fb62e3da9b44fa)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -65,7 +65,7 @@
     <Compile Include="TreeNodeInfos\AssessmentSectionTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\AssessmentSectionCommentContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\CategoryTreeFolderTreeNodeInfoTest.cs" />
-    <Compile Include="TreeNodeInfos\FailureMechanismContributionTreeNodeInfoTest.cs" />
+    <Compile Include="TreeNodeInfos\FailureMechanismContributionContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismPlaceholderTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismSectionsContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r504f726111ede24adc838a345fdcd1c47227c79b -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -156,7 +156,9 @@
             Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData);
             Assert.AreSame(assessmentSection, referenceLineContext.Parent);
 
-            Assert.AreSame(contribution, objects[1]);
+            var contributionContext = (FailureMechanismContributionContext)objects[1];
+            Assert.AreSame(contribution, contributionContext.WrappedData);
+            Assert.AreSame(assessmentSection, contributionContext.Parent);
 
             var context = (HydraulicBoundaryDatabaseContext) objects[2];
             Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.Parent.HydraulicBoundaryDatabase);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -0,0 +1,115 @@
+using System.Linq;
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui;
+using Core.Common.Gui.ContextMenu;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Integration.Plugin;
+using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
+using RingtoetsIntegrationDataResources = Ringtoets.Integration.Data.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class FailureMechanismContributionContextTreeNodeInfoTest
+    {
+        private MockRepository mocks;
+        private RingtoetsGuiPlugin plugin;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            plugin = new RingtoetsGuiPlugin();
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismContributionContext));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(FailureMechanismContributionContext), info.TagType);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNull(info.CanDrag);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
+        public void Text_Always_ReturnsTextFromResource()
+        {
+            // Call
+            var text = info.Text(null);
+
+            // Assert
+            Assert.AreEqual(RingtoetsIntegrationDataResources.FailureMechanismContribution_DisplayName, text);
+        }
+
+        [Test]
+        public void Image_Always_ReturnsSetImage()
+        {
+            // Call
+            var image = info.Image(null);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
+        {
+            // Setup
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 150000);
+
+            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+
+            var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+            menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+
+            var gui = mocks.StrictMock<IGui>();
+            gui.Expect(cmp => cmp.Get(contribution, treeViewControlMock)).Return(menuBuilderMock);
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+            mocks.ReplayAll();
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            plugin.Gui = gui;
+
+            // Call
+            info.ContextMenuStrip(context, null, treeViewControlMock);
+
+            // Assert
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag c8eb333514adae8495778ed16c71c41a6eb4251b refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -reaba38093f5f76350766303e83e497fd4af07227 -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision eaba38093f5f76350766303e83e497fd4af07227)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -6,6 +6,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
 
 namespace Ringtoets.Integration.Forms.Test.Views
@@ -16,23 +17,11 @@
         private const string normInputTextBoxName = "normInput";
         private const string dataGridViewControlName = "probabilityDistributionGrid";
 
-        private MockRepository mockRepository;
-        private FailureMechanismContribution distribution;
         private Form testForm;
 
         [SetUp]
         public void Setup()
         {
-            mockRepository = new MockRepository();
-            var random = new Random(21);
-            var norm = random.Next(1, 200000);
-            var otherContribution = random.Next(1, 100);
-            var failureMechanism = mockRepository.Stub<IFailureMechanism>();
-            distribution = new FailureMechanismContribution(new[]
-            {
-                failureMechanism
-            }, otherContribution, norm);
-
             testForm = new Form();
         }
 
@@ -46,18 +35,32 @@
         public void NormTextBox_Initialize_TextSetToData()
         {
             // Setup
+            var random = new Random(21);
+            var norm = random.Next(1, 200000);
+            var otherContribution = random.Next(1, 100);
+
+            var mockRepository = new MockRepository();
+            var failureMechanism = mockRepository.Stub<IFailureMechanism>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            using (var distributionView = new FailureMechanismContributionView
+            var contribution = new FailureMechanismContribution(new[]
             {
-                Data = distribution
+                failureMechanism
+            }, otherContribution, norm);
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            using (var contributionView = new FailureMechanismContributionView
+            {
+                Data = context
             })
             {
-                ShowFormWithView(distributionView);
+                ShowFormWithView(contributionView);
                 var normTester = new ControlTester(normInputTextBoxName);
 
                 // Assert
-                Assert.AreEqual(distribution.Norm.ToString(), normTester.Text);
+                Assert.AreEqual(contribution.Norm.ToString(), normTester.Text);
             }
             mockRepository.VerifyAll();
         }
@@ -66,15 +69,30 @@
         public void NormTextBox_ValueChanged_UpdatesDataWithNewValue()
         {
             // Setup
+            var random = new Random(21);
+            var norm = random.Next(1, 200000);
+            var otherContribution = random.Next(1, 100);
+
+            var mockRepository = new MockRepository();
+            var failureMechanism = mockRepository.Stub<IFailureMechanism>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+
             var observerMock = mockRepository.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver());
 
             mockRepository.ReplayAll();
 
+            var distribution = new FailureMechanismContribution(new[]
+            {
+                failureMechanism
+            }, otherContribution, norm);
             distribution.Attach(observerMock);
+
+            var context = new FailureMechanismContributionContext(distribution, assessmentSection);
+
             using (var distributionView = new FailureMechanismContributionView
             {
-                Data = distribution
+                Data = context
             })
             {
                 ShowFormWithView(distributionView);
@@ -96,26 +114,33 @@
         public void Data_SetNewData_DetachesFromOldData()
         {
             // Setup
-            object aValue = 100;
-            object expectedValue = 200;
+            var aValue = 100;
+            var expectedValue = 200;
             var random = new Random(21);
 
+            var mockRepository = new MockRepository();
+
             var someMechanism = mockRepository.Stub<IFailureMechanism>();
+            var assessmentSection1 = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection2 = mockRepository.Stub<IAssessmentSection>();
 
-            var failureMechanism = mockRepository.StrictMock<FailureMechanismContribution>(new[]
+            mockRepository.ReplayAll();
+
+            var initialContribution = new FailureMechanismContribution(new[]
             {
                 someMechanism
             }, random.Next(0, 100), aValue);
-            var newFailureMechanism = mockRepository.StrictMock<FailureMechanismContribution>(new[]
+            var newContribution = new FailureMechanismContribution(new[]
             {
                 someMechanism
             }, random.Next(0, 100), expectedValue);
 
-            mockRepository.ReplayAll();
+            var initialContext = new FailureMechanismContributionContext(initialContribution, assessmentSection1);
+            var newContext = new FailureMechanismContributionContext(newContribution, assessmentSection2);
 
             using (var distributionView = new FailureMechanismContributionView
             {
-                Data = failureMechanism
+                Data = initialContext
             })
             {
                 ShowFormWithView(distributionView);
@@ -125,17 +150,53 @@
                 Assert.AreEqual(aValue.ToString(), normTester.Properties.Text);
 
                 // Call
-                distributionView.Data = newFailureMechanism;
+                distributionView.Data = newContext;
 
                 // Assert
                 Assert.AreEqual(expectedValue.ToString(), normTester.Properties.Text);
+            }
 
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void UpdateObserver_ChangeNormAndNotify_UpdateNormTextBox()
+        {
+            // Setup
+            const int initialValue = 100;
+            const int expectedValue = 200;
+            var random = new Random(21);
+
+            var mockRepository = new MockRepository();
+
+            var someMechanism = mockRepository.Stub<IFailureMechanism>();
+            var assessmentSection1 = mockRepository.Stub<IAssessmentSection>();
+
+            mockRepository.ReplayAll();
+
+            var contribution = new FailureMechanismContribution(new[]
+            {
+                someMechanism
+            }, random.Next(0, 100), initialValue);
+
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection1);
+
+            using (var distributionView = new FailureMechanismContributionView
+            {
+                Data = context
+            })
+            {
+                ShowFormWithView(distributionView);
+                var normTester = new ControlTester(normInputTextBoxName);
+
+                // Precondition
+                Assert.AreEqual(initialValue.ToString(), normTester.Properties.Text);
+
                 // Call
-                failureMechanism.NotifyObservers();
+                contribution.Norm = expectedValue;
+                contribution.NotifyObservers();
 
                 // Assert
-                Assert.AreEqual(failureMechanism.Norm, aValue);
-                Assert.AreEqual(newFailureMechanism.Norm, expectedValue);
                 Assert.AreEqual(expectedValue.ToString(), normTester.Properties.Text);
             }
 
@@ -149,6 +210,9 @@
             using (var view = new FailureMechanismContributionView())
             {
                 // When
+                var mockRepository = new MockRepository();
+                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+
                 var failureMechanismStub = mockRepository.Stub<IFailureMechanism>();
                 failureMechanismStub.Stub(fm => fm.Name).Return("A");
                 failureMechanismStub.Contribution = 0;
@@ -158,8 +222,9 @@
                 {
                     failureMechanismStub
                 }, 100, 500);
+                var context = new FailureMechanismContributionContext(contributionData, assessmentSection);
 
-                view.Data = contributionData;
+                view.Data = context;
                 ShowFormWithView(view);
 
                 // Then
@@ -168,8 +233,9 @@
                 DataGridViewRow zeroContributionFailureMechanismRow = dataGridView.Rows[0];
                 DataGridViewCell probabilitySpaceCell = zeroContributionFailureMechanismRow.Cells[2];
                 Assert.AreEqual("n.v.t", probabilitySpaceCell.FormattedValue);
+
+                mockRepository.VerifyAll();
             }
-            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -182,6 +248,9 @@
                 const double contribution = 25.0;
                 const int norm = 500;
 
+                var mockRepository = new MockRepository();
+                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+
                 var failureMechanismStub = mockRepository.Stub<IFailureMechanism>();
                 failureMechanismStub.Stub(fm => fm.Name).Return("A");
                 failureMechanismStub.Contribution = contribution;
@@ -191,8 +260,9 @@
                 {
                     failureMechanismStub
                 }, 100.0 - contribution, norm);
+                var context = new FailureMechanismContributionContext(contributionData, assessmentSection);
 
-                view.Data = contributionData;
+                view.Data = context;
                 ShowFormWithView(view);
 
                 // Then
@@ -204,8 +274,9 @@
                 string expectedTextValue = new FailureMechanismContributionItem(failureMechanismStub, norm)
                     .ProbabilitySpace.ToString(probabilitySpaceCell.InheritedStyle.Format, probabilitySpaceCell.InheritedStyle.FormatProvider);
                 Assert.AreEqual(expectedTextValue, probabilitySpaceCell.FormattedValue);
+
+                mockRepository.VerifyAll();
             }
-            mockRepository.VerifyAll();
         }
 
         private void ShowFormWithView(FailureMechanismContributionView distributionView)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r504f726111ede24adc838a345fdcd1c47227c79b -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -76,7 +76,7 @@
                 // Assert
                 Assert.AreEqual(4, viewInfos.Length);
 
-                var contributionViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismContribution));
+                var contributionViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismContributionContext));
                 Assert.AreEqual(typeof(FailureMechanismContributionView), contributionViewInfo.ViewType);
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, contributionViewInfo.Image);
 
@@ -124,7 +124,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismPlaceholderContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CategoryTreeFolder)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionsContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContribution)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContributionContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HydraulicBoundaryDatabaseContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSectionCommentContext)));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs
===================================================================
diff -u -r504f726111ede24adc838a345fdcd1c47227c79b -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs	(.../FailureMechanismContributionViewInfoTest.cs)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs	(.../FailureMechanismContributionViewInfoTest.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -1,13 +1,12 @@
-using System.Collections.Generic;
-using System.Linq;
-using Core.Common.Base;
+using System.Linq;
+
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Contribution;
-using Ringtoets.HydraRing.Data;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -35,23 +34,20 @@
         }
 
         [Test]
-        public void Initialized_Always_ExpectedPropertiesSet()
-        {
-            // Assert
-            Assert.AreEqual(typeof(FailureMechanismContribution), info.DataType);
-        }
-
-        [Test]
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var view = new FailureMechanismContributionView();
+
             var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 1000);
-            var viewMock = mocks.StrictMock<FailureMechanismContributionView>();
 
-            mocks.ReplayAll();
+            var context = new FailureMechanismContributionContext(failureMechanismContribution, assessmentSection);
 
             // Call
-            var viewName = info.GetViewName(viewMock, failureMechanismContribution);
+            var viewName = info.GetViewName(view, context);
 
             // Assert
             Assert.AreEqual("Faalkansverdeling", viewName);
@@ -74,7 +70,7 @@
             var dataType = info.DataType;
 
             // Assert
-            Assert.AreEqual(typeof(FailureMechanismContribution), dataType);
+            Assert.AreEqual(typeof(FailureMechanismContributionContext), dataType);
         }
 
         [Test]
@@ -91,15 +87,22 @@
         public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue()
         {
             // Setup
-            var viewMock = mocks.StrictMock<FailureMechanismContributionView>();
-            var assessmentSection = new TestAssessmentSectionBase();
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 123456);
 
-            viewMock.Expect(vm => vm.Data).Return(assessmentSection.FailureMechanismContribution);
-
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.Stub(section => section.FailureMechanismContribution)
+                             .Return(contribution);
             mocks.ReplayAll();
 
+            var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+
+            var view = new FailureMechanismContributionView
+            {
+                Data = context
+            };
+
             // Call
-            var closeForData = info.CloseForData(viewMock, assessmentSection);
+            var closeForData = info.CloseForData(view, assessmentSection);
 
             // Assert
             Assert.IsTrue(closeForData);
@@ -109,45 +112,50 @@
         public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse()
         {
             // Setup
-            var viewMock = mocks.StrictMock<FailureMechanismContributionView>();
-            var assessmentSection = new TestAssessmentSectionBase();
-            var assessmentSection2 = new TestAssessmentSectionBase();
+            var contribution1 = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 123456);
+            var contribution2 = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 789123);
 
-            viewMock.Expect(vm => vm.Data).Return(assessmentSection2.FailureMechanismContribution);
-
+            var assessmentSection1 = mocks.Stub<IAssessmentSection>();
+            assessmentSection1.Stub(section => section.FailureMechanismContribution)
+                              .Return(contribution1);
+            var assessmentSection2 = mocks.Stub<IAssessmentSection>();
+            assessmentSection2.Stub(section => section.FailureMechanismContribution)
+                              .Return(contribution2);
             mocks.ReplayAll();
 
+
+            var context = new FailureMechanismContributionContext(contribution1, assessmentSection1);
+
+            var view = new FailureMechanismContributionView
+            {
+                Data = context
+            };
+
             // Call
-            var closeForData = info.CloseForData(viewMock, assessmentSection);
+            var closeForData = info.CloseForData(view, assessmentSection2);
 
             // Assert
             Assert.IsFalse(closeForData);
         }
 
-        private class TestAssessmentSectionBase : Observable, IAssessmentSection
+        [Test]
+        public void CloseForData_ViewWithoutData_ReturnsFalse()
         {
-            public TestAssessmentSectionBase()
-            {
-                FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 30, 1000);
-            }
+            // Setup
+            var contribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100.0, 789123);
 
-            public string Name { get; set; }
-            public string Comments { get; set; }
-            public AssessmentSectionComposition Composition { get; private set; }
-            public ReferenceLine ReferenceLine { get; set; }
-            public FailureMechanismContribution FailureMechanismContribution { get; private set; }
-            public HydraulicBoundaryDatabase HydraulicBoundaryDatabase { get; set; }
-            public IEnumerable<IFailureMechanism> GetFailureMechanisms()
-            {
-                throw new System.NotImplementedException();
-            }
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.Stub(section => section.FailureMechanismContribution)
+                              .Return(contribution);
+            mocks.ReplayAll();
 
-            public void ChangeComposition(AssessmentSectionComposition newComposition)
-            {
-                throw new System.NotImplementedException();
-            }
+            var view = new FailureMechanismContributionView();
 
-            public long StorageId { get; set; }
+            // Call
+            var closeForData = info.CloseForData(view, assessmentSection);
+
+            // Assert
+            Assert.IsFalse(closeForData);
         }
     }
 }
\ No newline at end of file