Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rc51ba92268d9a8272778e758fd0f9a71a0d61849 -rb799d06a62e878d9c2438df77de82d675eafea52
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision c51ba92268d9a8272778e758fd0f9a71a0d61849)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision b799d06a62e878d9c2438df77de82d675eafea52)
@@ -96,7 +96,8 @@
                 GetViewName = (view, context) => context.WrappedData.Name,
                 Image = RingtoetsCommonFormsResources.CalculationIcon,
                 CloseForData = CloseStabilityPointStructuresFailureMechanismViewForData,
-                AdditionalDataCheck = context => context.WrappedData.IsRelevant
+                AdditionalDataCheck = context => context.WrappedData.IsRelevant,
+                CreateInstance = context => new StabilityPointStructuresFailureMechanismView(context.WrappedData, context.Parent)
             };
 
             yield return new ViewInfo<
@@ -267,12 +268,9 @@
             var assessmentSection = o as IAssessmentSection;
             var failureMechanism = o as StabilityPointStructuresFailureMechanism;
 
-            var viewFailureMechanismContext = (StabilityPointStructuresFailureMechanismContext) view.Data;
-            StabilityPointStructuresFailureMechanism viewFailureMechanism = viewFailureMechanismContext.WrappedData;
-
             return assessmentSection != null
-                       ? ReferenceEquals(viewFailureMechanismContext.Parent, assessmentSection)
-                       : ReferenceEquals(viewFailureMechanism, failureMechanism);
+                       ? ReferenceEquals(view.AssessmentSection, assessmentSection)
+                       : ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
         #endregion
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r8e761caf9d9a0440b655a16a3c4b25d7fb87f5c2 -rb799d06a62e878d9c2438df77de82d675eafea52
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs	(.../StabilityPointStructuresFailureMechanismViewInfoTest.cs)	(revision 8e761caf9d9a0440b655a16a3c4b25d7fb87f5c2)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs	(.../StabilityPointStructuresFailureMechanismViewInfoTest.cs)	(revision b799d06a62e878d9c2438df77de82d675eafea52)
@@ -21,6 +21,7 @@
 
 using System.Drawing;
 using System.Linq;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -99,13 +100,9 @@
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = failureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
 
@@ -121,15 +118,10 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = failureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -143,17 +135,11 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var otherStabilityPointStructuresFailureMechanism = new StabilityPointStructuresFailureMechanism();
 
-            var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection);
-
-            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = failureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, otherStabilityPointStructuresFailureMechanism);
 
@@ -167,15 +153,10 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = failureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);
 
@@ -207,5 +188,21 @@
             Assert.AreEqual(isRelevant, result);
             mocks.VerifyAll();
         }
+
+        [Test]
+        public void CreateInstance_WithContext_ReturnStabilityPointStructuresFailureMechanismView()
+        {
+            // Setup
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            var context = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection);
+
+            // Call
+            IView view = info.CreateInstance(context);
+
+            // Assert
+            Assert.IsInstanceOf<StabilityPointStructuresFailureMechanismView>(view);
+        }
     }
 }
\ No newline at end of file