Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresProbabilityFailureMechanismSectionResultContext.cs
===================================================================
diff -u
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresProbabilityFailureMechanismSectionResultContext.cs	(revision 0)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresProbabilityFailureMechanismSectionResultContext.cs	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Riskeer.ClosingStructures.Data;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Forms.PresentationObjects;
+
+namespace Riskeer.ClosingStructures.Forms.PresentationObjects
+{
+    /// <summary>
+    /// This class is a presentation object for a collection of <see cref="AdoptableFailureMechanismSectionResult"/>
+    /// for the <see cref="ClosingStructuresFailureMechanism"/>.
+    /// </summary>
+    public class ClosingStructuresProbabilityFailureMechanismSectionResultContext : ProbabilityFailureMechanismSectionResultContext<AdoptableFailureMechanismSectionResult>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="ClosingStructuresProbabilityFailureMechanismSectionResultContext"/>.
+        /// </summary>
+        /// <param name="wrappedSectionResults">The <see cref="IObservableEnumerable{T}"/>
+        /// of <see cref="AdoptableFailureMechanismSectionResult"/> to wrap.</param>
+        /// <param name="failureMechanism">The <see cref="ClosingStructuresFailureMechanism"/>
+        /// the <paramref name="wrappedSectionResults"/> belongs to.</param>
+        /// <param name="assessmentSection">The assessment section the section results belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public ClosingStructuresProbabilityFailureMechanismSectionResultContext(IObservableEnumerable<AdoptableFailureMechanismSectionResult> wrappedSectionResults,
+                                                                                ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+            : base(wrappedSectionResults, failureMechanism, assessmentSection) {}
+    }
+}
\ No newline at end of file
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r8f0bae62debe2a50e9151a7b10f76b6b2a1aba6c -rac91f4c76f9152b0041f684d2b38c9a5ae49d069
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 8f0bae62debe2a50e9151a7b10f76b6b2a1aba6c)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -52,6 +52,7 @@
 using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Common.Forms.TreeNodeInfos;
 using Riskeer.Common.Forms.UpdateInfos;
+using Riskeer.Common.Forms.Views;
 using Riskeer.Common.IO.FileImporters.MessageProviders;
 using Riskeer.Common.IO.Structures;
 using Riskeer.Common.Plugin;
@@ -109,16 +110,16 @@
             };
 
             yield return new RiskeerViewInfo<
-                ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>,
-                IObservableEnumerable<ClosingStructuresFailureMechanismSectionResultOld>,
-                ClosingStructuresFailureMechanismResultViewOld>(() => Gui)
+                ClosingStructuresProbabilityFailureMechanismSectionResultContext,
+                IObservableEnumerable<AdoptableFailureMechanismSectionResult>,
+                StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>>(() => Gui)
             {
                 GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 CloseForData = CloseFailureMechanismResultViewForData,
                 GetViewData = context => context.WrappedData,
-                CreateInstance = context => new ClosingStructuresFailureMechanismResultViewOld(
+                CreateInstance = context => new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
                     context.WrappedData,
-                    (ClosingStructuresFailureMechanism) context.FailureMechanism, context.AssessmentSection)
+                    (ClosingStructuresFailureMechanism) context.FailureMechanism, context.AssessmentSection, fm => fm.GeneralInput.N)
             };
 
             yield return new RiskeerViewInfo<ClosingStructuresScenariosContext, CalculationGroup, ClosingStructuresScenariosView>(() => Gui)
@@ -162,7 +163,7 @@
                 CalculationContextOnNodeRemoved,
                 CalculationType.Probabilistic);
 
-            yield return new TreeNodeInfo<ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>>
+            yield return new TreeNodeInfo<ClosingStructuresProbabilityFailureMechanismSectionResultContext>
             {
                 Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon,
@@ -299,7 +300,8 @@
                        : ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
-        private static bool CloseFailureMechanismResultViewForData(ClosingStructuresFailureMechanismResultViewOld view, object dataToCloseFor)
+        private static bool CloseFailureMechanismResultViewForData(StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput> view,
+                                                                   object dataToCloseFor)
         {
             var failureMechanism = dataToCloseFor as ClosingStructuresFailureMechanism;
 
@@ -315,7 +317,7 @@
                 failureMechanism = failurePathContext.WrappedData;
             }
 
-            return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResultsOld, failureMechanism.SectionResultsOld);
+            return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
         }
 
         private static bool CloseScenariosViewForData(ClosingStructuresScenariosView view, object dataToCloseFor)
@@ -476,8 +478,8 @@
             {
                 new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
-                new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>(
-                    failureMechanism.SectionResultsOld, failureMechanism, assessmentSection),
+                new ClosingStructuresProbabilityFailureMechanismSectionResultContext(
+                    failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
             };
         }
@@ -847,10 +849,10 @@
         {
             string message = RiskeerCommonFormsResources.VerifyUpdate_Confirm_calculation_output_cleared;
             if (StructureDependentDataShouldUpdate(new[]
+                {
+                    calculation
+                }, message))
             {
-                calculation
-            }, message))
-            {
                 UpdateStructureDerivedCalculationInput(calculation);
             }
         }
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresProbabilityFailureMechanismSectionResultContextTest.cs
===================================================================
diff -u
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresProbabilityFailureMechanismSectionResultContextTest.cs	(revision 0)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresProbabilityFailureMechanismSectionResultContextTest.cs	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -0,0 +1,54 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Rhino.Mocks;
+using Riskeer.ClosingStructures.Data;
+using Riskeer.ClosingStructures.Forms.PresentationObjects;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Forms.PresentationObjects;
+
+namespace Riskeer.ClosingStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class ClosingStructuresProbabilityFailureMechanismSectionResultContextTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+
+            // Call
+            var context = new ClosingStructuresProbabilityFailureMechanismSectionResultContext(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection);
+
+            // Assert
+            Assert.IsInstanceOf<ProbabilityFailureMechanismSectionResultContext<AdoptableFailureMechanismSectionResult>>(context);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -rac91f4c76f9152b0041f684d2b38c9a5ae49d069
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -35,8 +35,9 @@
 using Riskeer.ClosingStructures.Forms.PropertyClasses;
 using Riskeer.ClosingStructures.Forms.Views;
 using Riskeer.Common.Data.Calculation;
-using Riskeer.Common.Forms.PresentationObjects;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.PropertyClasses;
+using Riskeer.Common.Forms.Views;
 
 namespace Riskeer.ClosingStructures.Plugin.Test
 {
@@ -106,7 +107,7 @@
                 Assert.AreEqual(9, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ClosingStructuresCalculationsContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ClosingStructuresFailurePathContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ClosingStructuresProbabilityFailureMechanismSectionResultContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ClosingStructuresContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ClosingStructure)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ClosingStructuresCalculationGroupContext)));
@@ -127,12 +128,12 @@
             var gui = mockRepository.Stub<IGui>();
             gui.Stub(g => g.ActiveStateInfo).Return(new StateInfo(string.Empty, symbol, fontFamily, p => p));
             mockRepository.ReplayAll();
-            
+
             using (var plugin = new ClosingStructuresPlugin
+                   {
+                       Gui = gui
+                   })
             {
-                Gui = gui
-            })
-            {
                 // Call
                 ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray();
 
@@ -151,9 +152,9 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>),
-                    typeof(IObservableEnumerable<ClosingStructuresFailureMechanismSectionResultOld>),
-                    typeof(ClosingStructuresFailureMechanismResultViewOld));
+                    typeof(ClosingStructuresProbabilityFailureMechanismSectionResultContext),
+                    typeof(IObservableEnumerable<AdoptableFailureMechanismSectionResult>),
+                    typeof(StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
@@ -173,7 +174,7 @@
                     Assert.AreSame(fontFamily, vi.GetFontFamily());
                 });
             }
-            
+
             mockRepository.VerifyAll();
         }
 
@@ -219,10 +220,10 @@
             mocks.ReplayAll();
 
             using (var plugin = new ClosingStructuresPlugin
+                   {
+                       Gui = gui
+                   })
             {
-                Gui = gui
-            })
-            {
                 // Call
                 ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray();
 
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rac91f4c76f9152b0041f684d2b38c9a5ae49d069
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -159,9 +159,9 @@
             Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism);
             Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData);
 
-            var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (ClosingStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
-            Assert.AreSame(failureMechanism.SectionResultsOld, failureMechanismResultsContext.WrappedData);
+            Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
             var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(3);
@@ -175,7 +175,7 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
-            
+
             var failureMechanism = new ClosingStructuresFailureMechanism
             {
                 InAssembly = false
@@ -190,7 +190,7 @@
 
             var comment = (Comment) children[0];
             Assert.AreSame(failureMechanism.NotInAssemblyComments, comment);
-            
+
             mocks.VerifyAll();
         }
 
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -rac91f4c76f9152b0041f684d2b38c9a5ae49d069
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -29,9 +29,10 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.ClosingStructures.Data;
+using Riskeer.ClosingStructures.Forms.PresentationObjects;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Forms.Properties;
 
 namespace Riskeer.ClosingStructures.Plugin.Test.TreeNodeInfos
@@ -46,7 +47,7 @@
         public void Setup()
         {
             plugin = new ClosingStructuresPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresProbabilityFailureMechanismSectionResultContext));
         }
 
         [TearDown]
@@ -112,12 +113,12 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var failureMechanism = new ClosingStructuresFailureMechanism();
-                var sectionResult = new ClosingStructuresFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
-                var sectionResultContext = new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>(
-                    new ObservableList<ClosingStructuresFailureMechanismSectionResultOld>
-                    {
-                        sectionResult
-                    }, failureMechanism, assessmentSection);
+                var sectionResult = new ObservableList<AdoptableFailureMechanismSectionResult>
+                {
+                    new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
+                };
+                var sectionResultContext = new ClosingStructuresProbabilityFailureMechanismSectionResultContext(
+                    sectionResult, failureMechanism, assessmentSection);
 
                 var gui = mockRepository.Stub<IGui>();
                 gui.Stub(g => g.Get(sectionResultContext, treeViewControl)).Return(menuBuilder);
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rac91f4c76f9152b0041f684d2b38c9a5ae49d069
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
@@ -27,11 +27,10 @@
 using Rhino.Mocks;
 using Riskeer.ClosingStructures.Data;
 using Riskeer.ClosingStructures.Forms.PresentationObjects;
-using Riskeer.ClosingStructures.Forms.Views;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Forms.PresentationObjects;
+using Riskeer.Common.Forms.Views;
 
 namespace Riskeer.ClosingStructures.Plugin.Test.ViewInfos
 {
@@ -47,7 +46,7 @@
         {
             mocks = new MockRepository();
             plugin = new ClosingStructuresPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ClosingStructuresFailureMechanismResultViewOld));
+            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>));
         }
 
         [TearDown]
@@ -60,42 +59,45 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>), info.DataType);
-            Assert.AreEqual(typeof(IObservableEnumerable<ClosingStructuresFailureMechanismSectionResultOld>), info.ViewDataType);
+            Assert.AreEqual(typeof(ClosingStructuresProbabilityFailureMechanismSectionResultContext), info.DataType);
+            Assert.AreEqual(typeof(IObservableEnumerable<AdoptableFailureMechanismSectionResult>), info.ViewDataType);
         }
 
         [Test]
-        public void GetViewData_Always_ReturnsWrappedFailureMechanismResult()
+        public void GetViewName_Always_ReturnsViewName()
         {
+            // Call
+            string viewName = info.GetViewName(null, null);
+
+            // Assert
+            Assert.AreEqual("Resultaat", viewName);
+        }
+
+        [Test]
+        public void GetViewData_Always_ReturnsSectionResults()
+        {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>(
-                failureMechanism.SectionResultsOld,
-                failureMechanism,
-                assessmentSection);
+            failureMechanism.SetSections(new[]
+            {
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
+            }, string.Empty);
 
+            var context = new ClosingStructuresProbabilityFailureMechanismSectionResultContext(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection);
+
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
-            Assert.AreSame(failureMechanism.SectionResultsOld, viewData);
+            Assert.AreSame(failureMechanism.SectionResults, viewData);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GetViewName_Always_ReturnsViewName()
-        {
-            // Call
-            string viewName = info.GetViewName(null, null);
-
-            // Assert
-            Assert.AreEqual("Resultaat", viewName);
-        }
-        
-        [Test]
         public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse()
         {
             // Setup
@@ -105,7 +107,8 @@
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -131,7 +134,8 @@
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -156,7 +160,8 @@
             });
             mocks.ReplayAll();
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -177,7 +182,8 @@
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);
@@ -198,7 +204,8 @@
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, new ClosingStructuresFailureMechanism());
@@ -220,7 +227,8 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var context = new ClosingStructuresFailurePathContext(failureMechanism, assessmentSection);
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, context);
@@ -242,7 +250,8 @@
             var context = new ClosingStructuresFailurePathContext(new ClosingStructuresFailureMechanism(), assessmentSection);
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            using (var view = new ClosingStructuresFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism, assessmentSection))
+            using (var view = new StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>(
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, context);
@@ -261,16 +270,16 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResultOld>(
-                failureMechanism.SectionResultsOld,
+            var context = new ClosingStructuresProbabilityFailureMechanismSectionResultContext(
+                failureMechanism.SectionResults,
                 failureMechanism,
                 assessmentSection);
 
             // Call
             IView view = info.CreateInstance(context);
 
             // Assert
-            Assert.IsInstanceOf<ClosingStructuresFailureMechanismResultViewOld>(view);
+            Assert.IsInstanceOf<StructuresFailureMechanismResultView<ClosingStructuresFailureMechanism, ClosingStructuresInput>>(view);
             mocks.VerifyAll();
         }
     }