Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r31089c28777af00964e16b49b49fa2fff8311617 -r36b251c4f00aaf9335df69040fe592336ff01928
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 31089c28777af00964e16b49b49fa2fff8311617)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 36b251c4f00aaf9335df69040fe592336ff01928)
@@ -1410,7 +1410,7 @@
                                        GetInputs(nodeData.WrappedData, nodeData.Parent),
                                        TreeFolderCategory.Input),
                 new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName,
-                                       GetOutputs(nodeData.WrappedData, nodeData.Parent),
+                                       GetOutputs(nodeData.WrappedData),
                                        TreeFolderCategory.Output)
             };
         }
@@ -1432,12 +1432,11 @@
             };
         }
 
-        private static IEnumerable<object> GetOutputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection)
+        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 pipingStructure = nodeData as IHasSectionResults<PipingStructureFailureMechanismSectionResult>;
             var technicalInnovation = nodeData as IHasSectionResults<TechnicalInnovationFailureMechanismSectionResult>;
             var strengthStabilityLengthwiseConstruction = nodeData as IHasSectionResults<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>;
             var waterPressureAsphaltCover = nodeData as IHasSectionResults<WaterPressureAsphaltCoverFailureMechanismSectionResult>;
@@ -1464,13 +1463,6 @@
                         microstability.SectionResults, nodeData);
             }
 
-            if (pipingStructure != null)
-            {
-                failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResult>(
-                        pipingStructure.SectionResults, nodeData);
-            }
-
             if (technicalInnovation != null)
             {
                 failureMechanismSectionResultContexts[0] =
@@ -1682,6 +1674,24 @@
                           .Build();
         }
 
+        private static IEnumerable<object> GetOutputs(PipingStructureFailureMechanism nodeData,
+                                                      IAssessmentSection assessmentSection)
+        {
+            var failureMechanismResultContexts = new object[3];
+
+            failureMechanismResultContexts[0] =
+                new GeotechnicalFailureMechanismAssemblyCategoriesContext(nodeData,
+                                                                          assessmentSection,
+                                                                          () => nodeData.N);
+            failureMechanismResultContexts[1] =
+                new ProbabilityFailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResult>(
+                    nodeData.SectionResults, nodeData, assessmentSection);
+
+            failureMechanismResultContexts[2] = nodeData.OutputComments;
+
+            return failureMechanismResultContexts;
+        }
+
         #endregion
 
         #region CategoryTreeFolder TreeNodeInfo
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4ca0389a47c2979f47d826f86a84e2e9f7a6f7f6 -r36b251c4f00aaf9335df69040fe592336ff01928
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4ca0389a47c2979f47d826f86a84e2e9f7a6f7f6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 36b251c4f00aaf9335df69040fe592336ff01928)
@@ -171,12 +171,17 @@
             var outputFolder = (CategoryTreeFolder) children[1];
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
+            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
+            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
+            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(failureMechanism.N, failureMechanismAssemblyCategoriesContext.GetNFunc());
+
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(0);
+                outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }