Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r95605fb4015061bf2eacd284b2e4f2f9dd9596b0 -r409f425c74884ec6cbd5f56ceb89111dfa2394b5
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 95605fb4015061bf2eacd284b2e4f2f9dd9596b0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5)
@@ -1574,62 +1574,6 @@
             };
         }
 
-        private static IEnumerable<object> GetOutputs(IFailureMechanism nodeData)
-        {
-            var grassCoverSlipOffInwards = nodeData as IHasSectionResults<GrassCoverSlipOffInwardsFailureMechanismSectionResult>;
-            var grassCoverSlipOffOutwards = nodeData as IHasSectionResults<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>;
-            var microstability = nodeData as IHasSectionResults<MicrostabilityFailureMechanismSectionResult>;
-            var technicalInnovation = nodeData as IHasSectionResults<TechnicalInnovationFailureMechanismSectionResult>;
-            var strengthStabilityLengthwiseConstruction = nodeData as IHasSectionResults<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>;
-            var waterPressureAsphaltCover = nodeData as IHasSectionResults<WaterPressureAsphaltCoverFailureMechanismSectionResult>;
-
-            var failureMechanismSectionResultContexts = new object[2];
-            if (grassCoverSlipOffInwards != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<GrassCoverSlipOffInwardsFailureMechanismSectionResult>(
-                        grassCoverSlipOffInwards.SectionResults, nodeData);
-            }
-
-            if (grassCoverSlipOffOutwards != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>(
-                        grassCoverSlipOffOutwards.SectionResults, nodeData);
-            }
-
-            if (microstability != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResult>(
-                        microstability.SectionResults, nodeData);
-            }
-
-            if (technicalInnovation != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<TechnicalInnovationFailureMechanismSectionResult>(
-                        technicalInnovation.SectionResults, nodeData);
-            }
-
-            if (strengthStabilityLengthwiseConstruction != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>(
-                        strengthStabilityLengthwiseConstruction.SectionResults, nodeData);
-            }
-
-            if (waterPressureAsphaltCover != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>(
-                        waterPressureAsphaltCover.SectionResults, nodeData);
-            }
-
-            failureMechanismSectionResultContexts[1] = nodeData.OutputComments;
-            return failureMechanismSectionResultContexts;
-        }
-
         private ContextMenuStrip StandAloneFailureMechanismEnabledContextMenuStrip(IFailureMechanismContext<IFailureMechanism> nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
@@ -1684,11 +1628,21 @@
         {
             return new object[]
             {
-                new GrassCoverSlipOffInwardsFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new GrassCoverSlipOffInwardsFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
 
+        private static IEnumerable<object> GetOutputs(GrassCoverSlipOffInwardsFailureMechanism nodeData)
+        {
+            return new object[]
+            {
+                new FailureMechanismSectionResultContext<GrassCoverSlipOffInwardsFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData),
+                nodeData.OutputComments
+            };
+        }
+
         #endregion
 
         #region GrassCoverSlipOffOutwardsFailureMechanismContext TreeNodeInfo
@@ -1715,6 +1669,16 @@
             };
         }
 
+        private static IEnumerable<object> GetOutputs(GrassCoverSlipOffOutwardsFailureMechanism nodeData)
+        {
+            return new object[]
+            {
+                new FailureMechanismSectionResultContext<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData),
+                nodeData.OutputComments
+            };
+        }
+
         #endregion
 
         #region MacroStabilityOutwardsFailureMechanismContext TreeNodeInfo
@@ -1736,7 +1700,7 @@
         {
             return new object[]
             {
-                new MacroStabilityOutwardsFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new MacroStabilityOutwardsFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
@@ -1777,11 +1741,21 @@
         {
             return new object[]
             {
-                new MicrostabilityFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new MicrostabilityFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
 
+        private static IEnumerable<object> GetOutputs(MicrostabilityFailureMechanism nodeData)
+        {
+            return new object[]
+            {
+                new FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData),
+                nodeData.OutputComments
+            };
+        }
+
         #endregion
 
         #region PipingStructureFailureMechanismContext TreeNodeInfo
@@ -1803,7 +1777,7 @@
         {
             return new object[]
             {
-                new PipingStructureFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new PipingStructureFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
@@ -1844,11 +1818,21 @@
         {
             return new object[]
             {
-                new StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
 
+        private static IEnumerable<object> GetOutputs(StrengthStabilityLengthwiseConstructionFailureMechanism nodeData)
+        {
+            return new object[]
+            {
+                new FailureMechanismSectionResultContext<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData),
+                nodeData.OutputComments
+            };
+        }
+
         #endregion
 
         #region TechnicalInnovationFailureMechanismContext TreeNodeInfo
@@ -1870,11 +1854,21 @@
         {
             return new object[]
             {
-                new TechnicalInnovationFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new TechnicalInnovationFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
 
+        private static IEnumerable<object> GetOutputs(TechnicalInnovationFailureMechanism nodeData)
+        {
+            return new object[]
+            {
+                new FailureMechanismSectionResultContext<TechnicalInnovationFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData),
+                nodeData.OutputComments
+            };
+        }
+
         #endregion
 
         #region WaterPressureAsphaltCoverFailureMechanismContext TreeNodeInfo
@@ -1896,11 +1890,21 @@
         {
             return new object[]
             {
-                new WaterPressureAsphaltCoverFailureMechanismSectionsContext(nodeData, assessmentSection), 
+                new WaterPressureAsphaltCoverFailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.InputComments
             };
         }
 
+        private static IEnumerable<object> GetOutputs(WaterPressureAsphaltCoverFailureMechanism nodeData)
+        {
+            return new object[]
+            {
+                new FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData),
+                nodeData.OutputComments
+            };
+        }
+
         #endregion
 
         #region CategoryTreeFolder TreeNodeInfo