Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -r518dfa47b823fa99b34f47f670398ab5849d1418 -re5de460dc041f2a7168e9da8dd270ef301021c5d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 518dfa47b823fa99b34f47f670398ab5849d1418)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision e5de460dc041f2a7168e9da8dd270ef301021c5d)
@@ -412,12 +412,9 @@
             var assessmentSection = o as IAssessmentSection;
             var failureMechanism = o as MacroStabilityInwardsFailureMechanism;
 
-            var viewFailureMechanismContext = (MacroStabilityInwardsFailureMechanismContext) view.Data;
-            MacroStabilityInwardsFailureMechanism viewMacroStabilityInwardsFailureMechanism = viewFailureMechanismContext.WrappedData;
-
             return assessmentSection != null
-                       ? ReferenceEquals(viewFailureMechanismContext.Parent, assessmentSection)
-                       : ReferenceEquals(viewMacroStabilityInwardsFailureMechanism, failureMechanism);
+                       ? ReferenceEquals(view.AssessmentSection, assessmentSection)
+                       : ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
         #endregion
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r126e5019fc65c0810431596d09696789397a1d51 -re5de460dc041f2a7168e9da8dd270ef301021c5d
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismViewInfoTest.cs)	(revision 126e5019fc65c0810431596d09696789397a1d51)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismViewInfoTest.cs)	(revision e5de460dc041f2a7168e9da8dd270ef301021c5d)
@@ -100,13 +100,9 @@
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            var macroStabilityInwardsFailureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = macroStabilityInwardsFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
 
@@ -122,15 +118,10 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            var macroStabilityInwardsFailureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = macroStabilityInwardsFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -144,17 +135,11 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var otherMacroStabilityInwardsFailureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var macroStabilityInwardsFailureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection);
-
-            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = macroStabilityInwardsFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, otherMacroStabilityInwardsFailureMechanism);
 
@@ -168,15 +153,10 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            var macroStabilityInwardsFailureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new MacroStabilityInwardsFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = macroStabilityInwardsFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);