Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 -r171eda478707e1f059c568074c7be10ecc93abb8
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 171eda478707e1f059c568074c7be10ecc93abb8)
@@ -243,9 +243,10 @@
                 GetViewData = context => context.WrappedData,
                 GetViewName = (view, calculationGroup) => RingtoetsCommonFormsResources.Scenarios_DisplayName,
                 Image = RingtoetsCommonFormsResources.ScenariosIcon,
-                AdditionalDataCheck = context => context.WrappedData == context.ParentFailureMechanism.CalculationsGroup,
+                AdditionalDataCheck = context => context.WrappedData == context.FailureMechanism.CalculationsGroup,
                 CloseForData = ClosePipingScenariosViewForData,
-                AfterCreate = (view, context) => { view.PipingFailureMechanism = context.ParentFailureMechanism; }
+                CreateInstance = context => new PipingScenariosView(context.AssessmentSection),
+                AfterCreate = (view, context) => { view.PipingFailureMechanism = context.FailureMechanism; }
             };
         }
 
@@ -672,14 +673,14 @@
             return failureMechanism.Calculations.OfType<PipingCalculation>();
         }
 
-        private static object[] FailureMechanismEnabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext)
+        private static object[] FailureMechanismEnabledChildNodeObjects(PipingFailureMechanismContext context)
         {
-            PipingFailureMechanism wrappedData = pipingFailureMechanismContext.WrappedData;
+            PipingFailureMechanism wrappedData = context.WrappedData;
             return new object[]
             {
-                new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, pipingFailureMechanismContext.Parent), TreeFolderCategory.Input),
-                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData.SurfaceLines, wrappedData.StochasticSoilModels, wrappedData, pipingFailureMechanismContext.Parent),
-                new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData), TreeFolderCategory.Output)
+                new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, context.Parent), TreeFolderCategory.Input),
+                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData.SurfaceLines, wrappedData.StochasticSoilModels, wrappedData, context.Parent),
+                new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData, context.Parent), TreeFolderCategory.Output)
             };
         }
 
@@ -702,11 +703,11 @@
             };
         }
 
-        private static IEnumerable<object> GetOutputs(PipingFailureMechanism failureMechanism)
+        private static IEnumerable<object> GetOutputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new object[]
             {
-                new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
+                new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection),
                 new FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
                 failureMechanism.OutputComments