Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r642a4946d235601302d544697856fed3b5c7a2bd -r0f2cc55f2217e523d55eb173d3769f764ebc28a0
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 642a4946d235601302d544697856fed3b5c7a2bd)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0)
@@ -78,7 +78,7 @@
             };
             yield return new PropertyInfo<PipingOutputContext, PipingOutputProperties>
             {
-                CreateInstance = context => new PipingOutputProperties(context.WrappedData, context.DerivedOutput)
+                CreateInstance = context => new PipingOutputProperties(context.WrappedData, context.FailureMechanism, context.AssessmentSection)
             };
             yield return new PropertyInfo<PipingSurfaceLinesContext, PipingSurfaceLineCollectionProperties>
             {
@@ -752,26 +752,27 @@
                           .Build();
         }
 
-        private static object[] PipingCalculationContextChildNodeObjects(PipingCalculationScenarioContext pipingCalculationScenarioContext)
+        private static object[] PipingCalculationContextChildNodeObjects(PipingCalculationScenarioContext context)
         {
-            PipingCalculationScenario pipingCalculationScenario = pipingCalculationScenarioContext.WrappedData;
+            PipingCalculationScenario pipingCalculationScenario = context.WrappedData;
 
             var childNodes = new List<object>
             {
                 pipingCalculationScenario.Comments,
                 new PipingInputContext(pipingCalculationScenario.InputParameters,
                                        pipingCalculationScenario,
-                                       pipingCalculationScenarioContext.AvailablePipingSurfaceLines,
-                                       pipingCalculationScenarioContext.AvailableStochasticSoilModels,
-                                       pipingCalculationScenarioContext.FailureMechanism,
-                                       pipingCalculationScenarioContext.AssessmentSection)
+                                       context.AvailablePipingSurfaceLines,
+                                       context.AvailableStochasticSoilModels,
+                                       context.FailureMechanism,
+                                       context.AssessmentSection)
             };
 
             if (pipingCalculationScenario.HasOutput)
             {
                 childNodes.Add(new PipingOutputContext(
                                    pipingCalculationScenario.Output,
-                                   pipingCalculationScenario.SemiProbabilisticOutput));
+                                   context.FailureMechanism,
+                                   context.AssessmentSection));
             }
             else
             {