Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rc51ba92268d9a8272778e758fd0f9a71a0d61849 -r73bb4932d13d36d1cd3cd30d8151f2adf49646f2
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision c51ba92268d9a8272778e758fd0f9a71a0d61849)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 73bb4932d13d36d1cd3cd30d8151f2adf49646f2)
@@ -158,7 +158,8 @@
                 GetViewName = (view, context) => context.WrappedData.Name,
                 Image = RingtoetsCommonFormsResources.CalculationIcon,
                 CloseForData = CloseHeightStructuresFailureMechanismViewForData,
-                AdditionalDataCheck = context => context.WrappedData.IsRelevant
+                AdditionalDataCheck = context => context.WrappedData.IsRelevant,
+                CreateInstance = context => new HeightStructuresFailureMechanismView(context.WrappedData, context.Parent)
             };
 
             yield return new ViewInfo<
@@ -175,7 +176,7 @@
 
             yield return new ViewInfo<
                 ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>,
-                IEnumerable<HeightStructuresFailureMechanismSectionResult>,
+                IObservableEnumerable<HeightStructuresFailureMechanismSectionResult>,
                 HeightStructuresFailureMechanismResultView>
             {
                 GetViewName = (view, context) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
@@ -294,12 +295,9 @@
             var assessmentSection = data as IAssessmentSection;
             var failureMechanism = data as HeightStructuresFailureMechanism;
 
-            var viewFailureMechanismContext = (HeightStructuresFailureMechanismContext) view.Data;
-            HeightStructuresFailureMechanism viewFailureMechanism = viewFailureMechanismContext.WrappedData;
-
             return assessmentSection != null
-                       ? ReferenceEquals(viewFailureMechanismContext.Parent, assessmentSection)
-                       : ReferenceEquals(viewFailureMechanism, failureMechanism);
+                       ? ReferenceEquals(view.AssessmentSection, assessmentSection)
+                       : ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
         #endregion