Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContext.cs
===================================================================
diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -r8dd26f58e75996d093da443d10a788823c53e24f
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContext.cs	(.../ProbabilisticPipingProfileSpecificOutputContext.cs)	(revision c37eebd9171a53987f5929013edbe3d82e618ed0)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContext.cs	(.../ProbabilisticPipingProfileSpecificOutputContext.cs)	(revision 8dd26f58e75996d093da443d10a788823c53e24f)
@@ -21,8 +21,6 @@
 
 using System;
 using Core.Common.Controls.PresentationObjects;
-using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 
 namespace Riskeer.Piping.Forms.PresentationObjects.Probabilistic
@@ -37,36 +35,6 @@
         /// </summary>
         /// <param name="calculation">The <see cref="ProbabilisticPipingCalculationScenario"/> object to wrap.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
-        /// <param name="failureMechanism">The failure mechanism the output belongs to.</param>
-        /// <param name="assessmentSection">The assessment section the output belongs to.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public ProbabilisticPipingProfileSpecificOutputContext(ProbabilisticPipingCalculationScenario calculation,
-                                                               PipingFailureMechanism failureMechanism,
-                                                               IAssessmentSection assessmentSection)
-            : base(calculation)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
-
-            FailureMechanism = failureMechanism;
-            AssessmentSection = assessmentSection;
-        }
-
-        /// <summary>
-        /// Gets the failure mechanism which the context belongs to.
-        /// </summary>
-        public PipingFailureMechanism FailureMechanism { get; }
-
-        /// <summary>
-        /// Gets the assessment section which the context belongs to.
-        /// </summary>
-        public IAssessmentSection AssessmentSection { get; }
+        public ProbabilisticPipingProfileSpecificOutputContext(ProbabilisticPipingCalculationScenario calculation) : base(calculation) {}
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContext.cs
===================================================================
diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -r8dd26f58e75996d093da443d10a788823c53e24f
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContext.cs	(.../ProbabilisticPipingSectionSpecificOutputContext.cs)	(revision c37eebd9171a53987f5929013edbe3d82e618ed0)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContext.cs	(.../ProbabilisticPipingSectionSpecificOutputContext.cs)	(revision 8dd26f58e75996d093da443d10a788823c53e24f)
@@ -31,7 +31,7 @@
     public class ProbabilisticPipingSectionSpecificOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculationScenario>
     {
         /// <summary>
-        /// Creates a new instance of <see cref="ProbabilisticPipingOutputContext"/>.
+        /// Creates a new instance of <see cref="ProbabilisticPipingSectionSpecificOutputContext"/>.
         /// </summary>
         /// <param name="calculation">The <see cref="ProbabilisticPipingCalculationScenario"/> object to wrap.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r9885f0e3a0e8b9d13ad802a76baf8db1228d2b72 -r8dd26f58e75996d093da443d10a788823c53e24f
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 9885f0e3a0e8b9d13ad802a76baf8db1228d2b72)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 8dd26f58e75996d093da443d10a788823c53e24f)
@@ -132,11 +132,11 @@
             };
             yield return new PropertyInfo<ProbabilisticPipingProfileSpecificOutputContext, ProbabilisticPipingOutputProperties>
             {
-                CreateInstance = CreateProbabilisticPipingProfileSpecificOutputProperties
+                CreateInstance = context => CreateProbabilisticPipingOutputProperties(context.WrappedData.Output?.ProfileSpecificOutput)
             };
             yield return new PropertyInfo<ProbabilisticPipingSectionSpecificOutputContext, ProbabilisticPipingOutputProperties>
             {
-                CreateInstance = CreateProbabilisticPipingSectionSpecificOutputProperties
+                CreateInstance = context => CreateProbabilisticPipingOutputProperties(context.WrappedData.Output?.SectionSpecificOutput)
             };
         }
 
@@ -568,12 +568,10 @@
 
         #region PropertyInfos
 
-        #region ProbabilisticPipingProfileSpecificOutputContext PropertyInfo
-
-        private static ProbabilisticPipingOutputProperties CreateProbabilisticPipingProfileSpecificOutputProperties(
-            ProbabilisticPipingProfileSpecificOutputContext context)
+        private static ProbabilisticPipingOutputProperties CreateProbabilisticPipingOutputProperties(
+            IPartialProbabilisticPipingOutput partialProbabilisticPipingOutput)
         {
-            switch (context.WrappedData.Output?.ProfileSpecificOutput)
+            switch (partialProbabilisticPipingOutput)
             {
                 case PartialProbabilisticFaultTreePipingOutput partialProbabilisticFaultTreePipingOutput:
                     return new ProbabilisticFaultTreePipingOutputProperties(
@@ -588,28 +586,6 @@
 
         #endregion
 
-        #region ProbabilisticPipingSectionSpecificOutputContext PropertyInfo
-
-        private static ProbabilisticPipingOutputProperties CreateProbabilisticPipingSectionSpecificOutputProperties(
-            ProbabilisticPipingSectionSpecificOutputContext context)
-        {
-            switch (context.WrappedData.Output?.SectionSpecificOutput)
-            {
-                case PartialProbabilisticFaultTreePipingOutput partialProbabilisticFaultTreePipingOutput:
-                    return new ProbabilisticFaultTreePipingOutputProperties(
-                        partialProbabilisticFaultTreePipingOutput);
-                case PartialProbabilisticSubMechanismPipingOutput partialProbabilisticSubMechanismPipingOutput:
-                    return new ProbabilisticSubMechanismPipingOutputProperties
-                        (partialProbabilisticSubMechanismPipingOutput);
-                default:
-                    return null;
-            }
-        }
-
-        #endregion
-
-        #endregion
-
         #region ViewInfos
 
         private static bool CloseFailureMechanismResultViewForData(PipingFailureMechanismResultView view, object dataToCloseFor)