Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r213b20e92891887167ab4b031ca4a4b6250a4c2a -r41fac7fff0a505c08945108d795dcb877f10b816
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 41fac7fff0a505c08945108d795dcb877f10b816)
@@ -54,7 +54,6 @@
 using Ringtoets.HydraRing.Data;
 using Ringtoets.HydraRing.IO;
 using Ringtoets.Integration.Data.StandAlone;
-using Ringtoets.Integration.Data.StandAlone.Result;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.Views;
@@ -204,18 +203,12 @@
                                    Gui.Get(nodeData, treeViewControl).AddImportItem().Build()
             };
 
-            yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<SimpleFailureMechanismContext>(
+            yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<FailureMechanismContext<IFailureMechanism>>(
                 StandAloneFailureMechanismEnabledChildNodeObjects,
                 StandAloneFailureMechanismDisabledChildNodeObjects,
                 StandAloneFailureMechanismEnabledContextMenuStrip,
                 StandAloneFailureMechanismDisabledContextMenuStrip);
 
-            yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<CustomFailureMechanismContext>(
-                StandAloneFailureMechanismEnabledChildNodeObjects,
-                StandAloneFailureMechanismDisabledChildNodeObjects,
-                StandAloneFailureMechanismEnabledContextMenuStrip,
-                StandAloneFailureMechanismDisabledContextMenuStrip);
-
             yield return new TreeNodeInfo<FailureMechanismSectionsContext>
             {
                 Text = context => RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
@@ -328,42 +321,44 @@
 
         #region FailureMechanismResults ViewInfo
 
-        private static bool CloseSimpleFailureMechanismResultViewForData(FailureMechanismResultView view, object o)
+        private static bool CloseSimpleFailureMechanismResultViewForData(SimpleFailureMechanismResultView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
             var failureMechanism = o as IFailureMechanism;
             var failureMechanismContext = o as IFailureMechanismContext<IFailureMechanism>;
+            var data = view.Data;
             if (assessmentSection != null)
             {
                 return assessmentSection
                     .GetFailureMechanisms()
-                    .OfType<FailureMechanismBase<SimpleFailureMechanismSectionResult>>()
-                    .Any(fm => ReferenceEquals(view.Data, fm.SectionResults));
+                    .OfType<IHasSectionResults<FailureMechanismSectionResult>>()
+                    .Any(fm => ReferenceEquals(data, fm.SectionResults));
             }
             if (failureMechanismContext != null)
             {
                 failureMechanism = failureMechanismContext.WrappedData;
             }
-            return failureMechanism != null && ReferenceEquals(view.Data, ((FailureMechanismBase<SimpleFailureMechanismSectionResult>)failureMechanism).SectionResults);
+            return failureMechanism != null && ReferenceEquals(data, ((IHasSectionResults<FailureMechanismSectionResult>)failureMechanism).SectionResults);
         }
 
-        private static bool CloseCustomFailureMechanismResultViewForData(FailureMechanismResultView view, object o)
+        private static bool CloseCustomFailureMechanismResultViewForData(CustomFailureMechanismResultView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
             var failureMechanism = o as IFailureMechanism;
             var failureMechanismContext = o as IFailureMechanismContext<IFailureMechanism>;
+            var data = view.Data;
             if (assessmentSection != null)
             {
                 return assessmentSection
                     .GetFailureMechanisms()
-                    .OfType<FailureMechanismBase<CustomFailureMechanismSectionResult>>()
-                    .Any(fm => ReferenceEquals(view.Data, fm.SectionResults));
+                    .OfType<IHasSectionResults<FailureMechanismSectionResult>>()
+                    .Any(fm => ReferenceEquals(data, fm.SectionResults));
             }
             if (failureMechanismContext != null)
             {
                 failureMechanism = failureMechanismContext.WrappedData;
             }
-            return failureMechanism != null && ReferenceEquals(view.Data, ((FailureMechanismBase<CustomFailureMechanismSectionResult>)failureMechanism).SectionResults);
+            return failureMechanism != null && ReferenceEquals(data, ((IHasSectionResults<FailureMechanismSectionResult>)failureMechanism).SectionResults);
         }
 
         #endregion
@@ -590,8 +585,8 @@
 
         private IList GetOutputs(IFailureMechanism nodeData)
         {
-            var simple = nodeData as FailureMechanismBase<SimpleFailureMechanismSectionResult>;
-            var custom = nodeData as FailureMechanismBase<CustomFailureMechanismSectionResult>;
+            var simple = nodeData as IHasSectionResults<SimpleFailureMechanismSectionResult>;
+            var custom = nodeData as IHasSectionResults<CustomFailureMechanismSectionResult>;
             var failureMechanismSectionResultContexts = new object[1];
             if (simple != null)
             {