Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r286c7b0798c07f4932eea3324604773c5258fb48 -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 286c7b0798c07f4932eea3324604773c5258fb48)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -174,7 +174,7 @@
                                                                                  .Build()
             };
 
-            yield return new TreeNodeInfo<FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>>
+            yield return new TreeNodeInfo<StabilityStoneCoverFailureMechanismSectionResultContext>
             {
                 Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon,
@@ -402,8 +402,7 @@
             return new object[]
             {
                 new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
-                new FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>(
-                    failureMechanism.SectionResultsOld, failureMechanism),
+                new StabilityStoneCoverFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
             };
         }
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
@@ -144,7 +144,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyStabilityStoneCoverOutput)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverFailureMechanismSectionResultContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsOutputContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsInputContext)));
             }
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc824230711295e8892f4cb3348a3e28cec85e0d6 -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c824230711295e8892f4cb3348a3e28cec85e0d6)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
@@ -21,17 +21,13 @@
 
 using System.Drawing;
 using System.Linq;
-using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 using Core.Gui;
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.PresentationObjects;
-using Riskeer.StabilityStoneCover.Data;
+using Riskeer.StabilityStoneCover.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
 namespace Riskeer.StabilityStoneCover.Plugin.Test.TreeNodeInfos
@@ -48,7 +44,7 @@
         {
             mocks = new MockRepository();
             plugin = new StabilityStoneCoverPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StabilityStoneCoverFailureMechanismSectionResultContext));
         }
 
         [TearDown]
@@ -91,11 +87,8 @@
             // Setup
             mocks.ReplayAll();
 
-            var mechanism = new StabilityStoneCoverFailureMechanism();
-            var context = new FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>(mechanism.SectionResultsOld, mechanism);
-
             // Call
-            string text = info.Text(context);
+            string text = info.Text(null);
 
             // Assert
             Assert.AreEqual("Resultaat", text);
@@ -118,34 +111,21 @@
         public void ContextMenuStrip_Always_CallsBuilder()
         {
             // Setup
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var section = new FailureMechanismSection("A",
-                                                      new[]
-                                                      {
-                                                          new Point2D(0, 0)
-                                                      });
-            var sectionResult = new StabilityStoneCoverFailureMechanismSectionResultOld(section);
-            var sectionResultContext = new FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>(
-                new ObservableList<StabilityStoneCoverFailureMechanismSectionResultOld>
-                {
-                    sectionResult
-                }, failureMechanism);
-
             var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder);
             menuBuilder.Expect(mb => mb.Build()).Return(null);
 
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocks.Stub<IGui>();
-                gui.Stub(g => g.Get(sectionResultContext, treeViewControl)).Return(menuBuilder);
+                gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilder);
 
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
 
                 // Call
-                info.ContextMenuStrip(sectionResultContext, null, treeViewControl);
+                info.ContextMenuStrip(null, null, treeViewControl);
             }
 
             // Assert
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs)	(revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
@@ -155,9 +155,9 @@
                 Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
             }
 
-            var failureMechanismResultsContext = (FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>) outputsFolder.Contents.ElementAt(1);
+            var failureMechanismResultsContext = (StabilityStoneCoverFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
-            Assert.AreSame(failureMechanism.SectionResultsOld, failureMechanismResultsContext.WrappedData);
+            Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
             var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);