Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensions.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensions.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -25,6 +25,7 @@
 using Core.Common.Util.Extensions;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.StabilityPointStructures.Data;
 
 namespace Application.Ringtoets.Storage.Create.StabilityPointStructures
@@ -54,10 +55,10 @@
         }
 
         private static void AddEntitiesForSectionResults(
-            IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> sectionResults,
+            IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> sectionResults,
             PersistenceRegistry registry)
         {
-            foreach (StabilityPointStructuresFailureMechanismSectionResult failureMechanismSectionResult in sectionResults)
+            foreach (StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> failureMechanismSectionResult in sectionResults)
             {
                 StabilityPointStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry);
                 FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -21,30 +21,33 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.StabilityPointStructures.Data;
 
 namespace Application.Ringtoets.Storage.Create.StabilityPointStructures
 {
     /// <summary>
-    /// Extension methods for <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> related to creating a 
+    /// Extension methods for <see cref="StructuresFailureMechanismSectionResult{T}"/> related to creating a 
     /// <see cref="StabilityPointStructuresSectionResultEntity"/>.
     /// </summary>
     internal static class StabilityPointStructuresFailureMechanismSectionResultCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="StabilityPointStructuresSectionResultEntity"/> based on the information of the <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>.
+        /// Creates a <see cref="StabilityPointStructuresSectionResultEntity"/> based on the information of the <see cref="StructuresFailureMechanismSectionResult{T}"/>.
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <param name="registry">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="StabilityPointStructuresSectionResultEntity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
-        internal static StabilityPointStructuresSectionResultEntity Create(this StabilityPointStructuresFailureMechanismSectionResult result,
-                                                                           PersistenceRegistry registry)
+        internal static StabilityPointStructuresSectionResultEntity Create(
+            this StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result,
+            PersistenceRegistry registry)
         {
             if (registry == null)
             {
                 throw new ArgumentNullException(nameof(registry));
             }
+
             var sectionResultEntity = new StabilityPointStructuresSectionResultEntity
             {
                 LayerOne = Convert.ToByte(result.AssessmentLayerOne),
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -1040,7 +1040,8 @@
             foreach (StabilityPointStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                StabilityPointStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result = failureMechanism.SectionResults
+                                                                                                                .Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result, collector);
             }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensions.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -23,26 +23,28 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.StabilityPointStructures.Data;
 
 namespace Application.Ringtoets.Storage.Read.StabilityPointStructures
 {
     /// <summary>
-    /// This class defines extension methods for read operations for a <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> based on the
+    /// This class defines extension methods for read operations for a <see cref="StructuresFailureMechanismSectionResult{T}"/> based on the
     /// <see cref="StabilityPointStructuresSectionResultEntity"/>.
     /// </summary>
     internal static class StabilityPointStructuresSectionResultEntityReadExtensions
     {
         /// <summary>
         /// Reads the <see cref="StabilityPointStructuresSectionResultEntity"/> and use the information to update a 
-        /// <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>.
+        /// <see cref="StructuresFailureMechanismSectionResult{T}"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="StabilityPointStructuresSectionResultEntity"/> to create <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="StabilityPointStructuresSectionResultEntity"/> to create <see cref="StructuresFailureMechanismSectionResult{T}"/> for.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <param name="collector">The object keeping track of read operations.</param>
-        /// <returns>A new <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>.</returns>
+        /// <returns>A new <see cref="StructuresFailureMechanismSectionResult{T}"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        internal static void Read(this StabilityPointStructuresSectionResultEntity entity, StabilityPointStructuresFailureMechanismSectionResult sectionResult,
+        internal static void Read(this StabilityPointStructuresSectionResultEntity entity,
+                                  StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult,
                                   ReadConversionCollector collector)
         {
             if (sectionResult == null)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rbcd1a835c8d39b06f4934b040d6ea45fa44b2ee5 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision bcd1a835c8d39b06f4934b040d6ea45fa44b2ee5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -40,7 +40,7 @@
         public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(new TestFailureMechanismSection());
 
             // Call
             TestDelegate test = () => sectionResult.Create(null);
@@ -58,7 +58,7 @@
             var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
             RoundedDouble assessmentLayerThreeResult = random.NextRoundedDouble();
 
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(new TestFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneResult,
                 AssessmentLayerThree = assessmentLayerThreeResult
@@ -77,7 +77,7 @@
         public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(new TestFailureMechanismSection())
             {
                 AssessmentLayerThree = RoundedDouble.NaN
             };
@@ -94,7 +94,7 @@
         {
             // Setup
             var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(new TestFailureMechanismSection())
             {
                 Calculation = calculation
             };
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -793,15 +793,14 @@
             AssertComments(expectedFailureMechanism.NotRelevantComments, actualFailureMechanism.NotRelevantComments);
         }
 
-        private static void AssertFailureMechanismSectionResults(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> expectedSectionResults,
-                                                                 IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> actualSectionResults)
+        private static void AssertFailureMechanismSectionResults(IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> expectedSectionResults,
+                                                                 IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> actualSectionResults)
         {
             AssertCollectionAndItems(expectedSectionResults,
                                      actualSectionResults,
                                      (expectedItem, actualItem) =>
                                      {
                                          Assert.AreEqual(expectedItem.AssessmentLayerOne, actualItem.AssessmentLayerOne);
-                                         Assert.AreEqual(expectedItem.AssessmentLayerTwoA, actualItem.AssessmentLayerTwoA);
                                          Assert.AreEqual(expectedItem.AssessmentLayerThree, actualItem.AssessmentLayerThree);
                                          if (expectedItem.Calculation == null)
                                          {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -55,7 +55,7 @@
             var entity = new StabilityPointStructuresSectionResultEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(new StabilityPointStructuresFailureMechanismSectionResult(
+            TestDelegate call = () => entity.Read(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(
                                                       new TestFailureMechanismSection()), null);
 
             // Assert
@@ -81,14 +81,13 @@
                 LayerThree = layerThree,
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
 
             // Assert
             Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
-            Assert.IsNaN(sectionResult.AssessmentLayerTwoA);
             Assert.AreEqual(layerThree ?? double.NaN, sectionResult.AssessmentLayerThree, 1e-6);
             Assert.IsNotNull(sectionResult);
             Assert.IsNull(sectionResult.Calculation);
@@ -108,7 +107,7 @@
             {
                 StabilityPointStructuresCalculationEntity = calculationEntity
             };
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
===================================================================
diff -u -ra80c53d14601a09a7a2f83df9998afa419d1e3e1 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision a80c53d14601a09a7a2f83df9998afa419d1e3e1)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -464,7 +464,7 @@
             var calculationWithoutOutput = (StructuresCalculation<StabilityPointStructuresInput>) failureMechanism.CalculationsGroup.Children[2];
             Assert.IsFalse(calculationWithoutOutput.HasOutput);
 
-            StabilityPointStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult = failureMechanism.SectionResults.First();
             Assert.AreSame(calculationWithOutput, sectionResult.Calculation);
         }
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -ra80c53d14601a09a7a2f83df9998afa419d1e3e1 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision a80c53d14601a09a7a2f83df9998afa419d1e3e1)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -616,12 +616,12 @@
             failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
         }
 
-        private static void SetSectionResults(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> sectionResults,
+        private static void SetSectionResults(IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> sectionResults,
                                               StructuresCalculation<StabilityPointStructuresInput> calculation)
         {
             var random = new Random(21);
             var firstSectionResultHasCalculation = false;
-            foreach (StabilityPointStructuresFailureMechanismSectionResult sectionResult in sectionResults)
+            foreach (StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult in sectionResults)
             {
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r560ea9f96409cc65f4666adf212a1c135c5e626f -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 560ea9f96409cc65f4666adf212a1c135c5e626f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -1319,7 +1319,7 @@
             var closingStructures = nodeData as IHasSectionResults<StructuresFailureMechanismSectionResult<ClosingStructuresInput>>;
             var macroStabilityInwards = nodeData as IHasSectionResults<MacroStabilityInwardsFailureMechanismSectionResult>;
             var macrostabilityOutwards = nodeData as IHasSectionResults<MacroStabilityOutwardsFailureMechanismSectionResult>;
-            var stabilityPointConstruction = nodeData as IHasSectionResults<StabilityPointStructuresFailureMechanismSectionResult>;
+            var stabilityPointConstruction = nodeData as IHasSectionResults<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>;
 
             var failureMechanismSectionResultContexts = new object[2];
             if (duneErosion != null)
@@ -1403,7 +1403,7 @@
             if (stabilityPointConstruction != null)
             {
                 failureMechanismSectionResultContexts[0] =
-                    new FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(stabilityPointConstruction.SectionResults, nodeData);
+                    new FailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(stabilityPointConstruction.SectionResults, nodeData);
             }
 
             failureMechanismSectionResultContexts[1] = nodeData.OutputComments;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj
===================================================================
diff -u -r5ecd1c3d0800c241a096088b01332705cbd134ad -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj	(.../Ringtoets.StabilityPointStructures.Data.csproj)	(revision 5ecd1c3d0800c241a096088b01332705cbd134ad)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj	(.../Ringtoets.StabilityPointStructures.Data.csproj)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -22,7 +22,6 @@
     <Compile Include="StabilityPointStructure.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanism.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs" />
-    <Compile Include="StabilityPointStructuresFailureMechanismSectionResult.cs" />
     <Compile Include="StabilityPointStructuresInput.cs" />
     <Compile Include="StabilityPointStructureInflowModelType.cs" />
     <Compile Include="StabilityPointStructuresProbabilityAssessmentOutputFactory.cs" />
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs
===================================================================
diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -35,9 +35,9 @@
     /// Model containing input and output needed to perform different levels of the
     /// Strength and Stability of Point Constructions failure mechanism.
     /// </summary>
-    public class StabilityPointStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults<StabilityPointStructuresFailureMechanismSectionResult>
+    public class StabilityPointStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
     {
-        private readonly List<StabilityPointStructuresFailureMechanismSectionResult> sectionResults;
+        private readonly List<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> sectionResults;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StabilityPointStructuresFailureMechanism"/> class.
@@ -51,7 +51,7 @@
             };
             GeneralInput = new GeneralStabilityPointStructuresInput();
             StabilityPointStructures = new StructureCollection<StabilityPointStructure>();
-            sectionResults = new List<StabilityPointStructuresFailureMechanismSectionResult>();
+            sectionResults = new List<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>();
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
 
@@ -80,7 +80,7 @@
 
         public CalculationGroup CalculationsGroup { get; }
 
-        public IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> SectionResults
+        public IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> SectionResults
         {
             get
             {
@@ -92,7 +92,7 @@
         {
             base.AddSection(section);
 
-            sectionResults.Add(new StabilityPointStructuresFailureMechanismSectionResult(section));
+            sectionResults.Add(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section));
         }
 
         public override void ClearAllSections()
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs
===================================================================
diff -u -r5ecd1c3d0800c241a096088b01332705cbd134ad -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision 5ecd1c3d0800c241a096088b01332705cbd134ad)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -22,6 +22,7 @@
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.StabilityPointStructures.Data
 {
@@ -40,7 +41,7 @@
         /// <returns>The calculated assessment layer 2A; or <see cref="double.NaN"/> when there is no
         /// calculation assigned to the section result or the calculation is not performed.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static double GetAssessmentLayerTwoA(this StabilityPointStructuresFailureMechanismSectionResult sectionResult,
+        public static double GetAssessmentLayerTwoA(this StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult,
                                                     StabilityPointStructuresFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection)
         {
Fisheye: Tag 56246f10e7876b30f36a5b9709ec2e3332b4010a refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r34d95e966db6e2d2d68bda8bfb6529f5788c5d3a -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 34d95e966db6e2d2d68bda8bfb6529f5788c5d3a)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -35,9 +35,9 @@
 namespace Ringtoets.StabilityPointStructures.Forms.Views
 {
     /// <summary>
-    /// The view for a collection of <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>.
+    /// The view for a collection of <see cref="StructuresFailureMechanismSectionResult{T}"/>.
     /// </summary>
-    public class StabilityPointStructuresFailureMechanismResultView : FailureMechanismResultView<StabilityPointStructuresFailureMechanismSectionResult>
+    public class StabilityPointStructuresFailureMechanismResultView : FailureMechanismResultView<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
     {
         private const int assessmentLayerTwoAIndex = 2;
         private readonly IAssessmentSection assessmentSection;
@@ -93,7 +93,7 @@
             }
         }
 
-        protected override object CreateFailureMechanismSectionResultRow(StabilityPointStructuresFailureMechanismSectionResult sectionResult)
+        protected override object CreateFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult)
         {
             if (FailureMechanism == null)
             {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r1aebb54c436f6c01043d5ca18f74a99d825f43db -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRow.cs)	(revision 1aebb54c436f6c01043d5ca18f74a99d825f43db)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRow.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -30,23 +30,23 @@
 namespace Ringtoets.StabilityPointStructures.Forms.Views
 {
     /// <summary>
-    /// Class for displaying <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> as a row in a grid view.
+    /// This class represents a row of <see cref="StructuresFailureMechanismSectionResult{T}"/> for stability point structures
     /// </summary>
     public class StabilityPointStructuresFailureMechanismSectionResultRow
-        : FailureMechanismSectionResultRow<StabilityPointStructuresFailureMechanismSectionResult>
+        : FailureMechanismSectionResultRow<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
     {
         private readonly StabilityPointStructuresFailureMechanism failureMechanism;
         private readonly IAssessmentSection assessmentSection;
 
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresFailureMechanismSectionResultRow"/>.
         /// </summary>
-        /// <param name="sectionResult">The <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> to wrap
+        /// <param name="sectionResult">The <see cref="StructuresFailureMechanismSectionResult{T}"/> to wrap
         /// so that it can be displayed as a row.</param>
         /// <param name="failureMechanism">The failure mechanism the result belongs to.</param>
         /// <param name="assessmentSection">The assessment section the result belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public StabilityPointStructuresFailureMechanismSectionResultRow(StabilityPointStructuresFailureMechanismSectionResult sectionResult,
+        public StabilityPointStructuresFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult,
                                                                         StabilityPointStructuresFailureMechanism failureMechanism,
                                                                         IAssessmentSection assessmentSection)
             : base(sectionResult)
@@ -66,7 +66,7 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="StabilityPointStructuresFailureMechanismSectionResult.AssessmentLayerTwoA"/>.
+        /// Gets the value representing the result of the layer 2a assessment.
         /// </summary>
         [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
         public double AssessmentLayerTwoA
@@ -97,7 +97,7 @@
 
         /// <summary>
         /// Gets the <see cref="StructuresCalculation{T}"/> of the wrapped
-        /// <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>.
+        /// <see cref="StructuresFailureMechanismSectionResult{T}"/>.
         /// </summary>
         /// <returns><c>null</c> if the wrapped section result does not have a calculation
         /// set. Otherwise the calculation of the wrapped section result is returned.</returns>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenarioRow.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenarioRow.cs	(.../StabilityPointStructuresScenarioRow.cs)	(revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenarioRow.cs	(.../StabilityPointStructuresScenarioRow.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -27,19 +27,19 @@
 namespace Ringtoets.StabilityPointStructures.Forms.Views
 {
     /// <summary>
-    /// Container of a <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>,
+    /// Container of a <see cref="StructuresFailureMechanismSectionResult{T}"/>,
     /// which takes care of the representation of properties in a grid.
     /// </summary>
     public class StabilityPointStructuresScenarioRow : IScenarioRow<StructuresCalculation<StabilityPointStructuresInput>>
     {
-        private readonly StabilityPointStructuresFailureMechanismSectionResult sectionResult;
+        private readonly StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StabilityPointStructuresScenarioRow"/> class.
         /// </summary>
         /// <param name="sectionResult">The section result.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
-        public StabilityPointStructuresScenarioRow(StabilityPointStructuresFailureMechanismSectionResult sectionResult)
+        public StabilityPointStructuresScenarioRow(StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult)
         {
             if (sectionResult == null)
             {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r68ec2e96b004450e3b884fac10d1e7f6d7f18935 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 68ec2e96b004450e3b884fac10d1e7f6d7f18935)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -102,8 +102,8 @@
             };
 
             yield return new ViewInfo<
-                ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>,
-                IEnumerable<StabilityPointStructuresFailureMechanismSectionResult>,
+                ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>,
+                IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>,
                 StabilityPointStructuresFailureMechanismResultView>
             {
                 GetViewName = (view, context) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
@@ -132,7 +132,7 @@
                 FailureMechanismEnabledContextMenuStrip,
                 FailureMechanismDisabledContextMenuStrip);
 
-            yield return new TreeNodeInfo<ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>>
+            yield return new TreeNodeInfo<ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>>
             {
                 Text = context => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon,
@@ -411,7 +411,7 @@
             return new object[]
             {
                 new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
-                new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+                new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.OutputComments
             };
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj
===================================================================
diff -u -r5ecd1c3d0800c241a096088b01332705cbd134ad -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj	(.../Ringtoets.StabilityPointStructures.Data.Test.csproj)	(revision 5ecd1c3d0800c241a096088b01332705cbd134ad)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj	(.../Ringtoets.StabilityPointStructures.Data.Test.csproj)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -22,7 +22,6 @@
     <Compile Include="GeneralStabilityPointStructuresInputTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs" />
-    <Compile Include="StabilityPointStructuresFailureMechanismSectionResultTest.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismTest.cs" />
     <Compile Include="StabilityPointStructuresInputTest.cs" />
     <Compile Include="StabilityPointStructuresProbabilityAssessmentOutputFactoryTest.cs" />
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs
===================================================================
diff -u -r5ecd1c3d0800c241a096088b01332705cbd134ad -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs)	(revision 5ecd1c3d0800c241a096088b01332705cbd134ad)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -24,6 +24,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 
@@ -60,7 +61,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Call
             TestDelegate call = () => failureMechanismSectionResult.GetAssessmentLayerTwoA(null, assessmentSection);
@@ -76,7 +77,7 @@
         {
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Call
             TestDelegate call = () => failureMechanismSectionResult.GetAssessmentLayerTwoA(new StabilityPointStructuresFailureMechanism(), null);
@@ -95,7 +96,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Call
             double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new StabilityPointStructuresFailureMechanism(), assessmentSection);
@@ -113,7 +114,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 Calculation = new TestStabilityPointStructuresCalculation()
             };
@@ -135,7 +136,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 Calculation = new TestStabilityPointStructuresCalculation
                 {
Fisheye: Tag 56246f10e7876b30f36a5b9709ec2e3332b4010a refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs
===================================================================
diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -42,7 +42,7 @@
             // Assert
             Assert.IsInstanceOf<FailureMechanismBase>(failureMechanism);
             Assert.IsInstanceOf<ICalculatableFailureMechanism>(failureMechanism);
-            Assert.IsInstanceOf<IHasSectionResults<StabilityPointStructuresFailureMechanismSectionResult>>(failureMechanism);
+            Assert.IsInstanceOf<IHasSectionResults<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>>(failureMechanism);
             Assert.AreEqual("Kunstwerken - Sterkte en stabiliteit puntconstructies", failureMechanism.Name);
             Assert.AreEqual("STKWp", failureMechanism.Code);
 
@@ -70,7 +70,7 @@
 
             // Assert
             Assert.AreEqual(1, failureMechanism.SectionResults.Count());
-            Assert.IsInstanceOf<StabilityPointStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults.ElementAt(0));
+            Assert.IsInstanceOf<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(failureMechanism.SectionResults.ElementAt(0));
         }
 
         [Test]
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r1aebb54c436f6c01043d5ca18f74a99d825f43db -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 1aebb54c436f6c01043d5ca18f74a99d825f43db)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -76,7 +76,7 @@
             using (var view = new StabilityPointStructuresFailureMechanismResultView(assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<StabilityPointStructuresFailureMechanismSectionResult>>(view);
+                Assert.IsInstanceOf<FailureMechanismResultView<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>>(view);
                 Assert.IsNull(view.Data);
             }
 
@@ -90,8 +90,8 @@
             using (StabilityPointStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView())
             {
                 FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-                var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
-                var testData = new List<StabilityPointStructuresFailureMechanismSectionResult>
+                var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+                var testData = new List<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
                 {
                     sectionResult
                 };
@@ -249,17 +249,17 @@
             });
 
             var random = new Random(21);
-            var result1 = new StabilityPointStructuresFailureMechanismSectionResult(section1)
+            var result1 = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section1)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
-            var result2 = new StabilityPointStructuresFailureMechanismSectionResult(section2)
+            var result2 = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section2)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.NotAssessed,
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
-            var result3 = new StabilityPointStructuresFailureMechanismSectionResult(section3)
+            var result3 = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section3)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.NoVerdict,
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
@@ -328,7 +328,7 @@
                 new Point2D(0, 0)
             });
             var random = new Random(21);
-            var result = new StabilityPointStructuresFailureMechanismSectionResult(section)
+            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 AssessmentLayerOne = assessmentLayerOneState,
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
@@ -391,7 +391,7 @@
             using (StabilityPointStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView())
             {
                 FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-                var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+                var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
                 {
                     AssessmentLayerOne = assessmentLayerOneState
                 };
@@ -425,7 +425,7 @@
             {
                 var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
                 FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-                var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+                var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
                 {
                     Calculation = calculation,
                     AssessmentLayerOne = assessmentLayerOneState
@@ -463,7 +463,7 @@
                     Output = new TestStructuresOutput(double.NaN)
                 };
                 FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-                var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+                var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
                 {
                     Calculation = calculation,
                     AssessmentLayerOne = assessmentLayerOneState
@@ -499,7 +499,7 @@
                     Output = new TestStructuresOutput(0.56789)
                 };
                 FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-                var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+                var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
                 {
                     Calculation = calculation
                 };
@@ -526,7 +526,7 @@
         [Test]
         [TestCaseSource(nameof(AssessmentLayerOneStateIsSufficientVariousSections))]
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
-            StabilityPointStructuresFailureMechanismSectionResult sectionResult, string expectedValue)
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult, string expectedValue)
         {
             using (StabilityPointStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView())
             {
@@ -568,7 +568,7 @@
                     Output = new TestStructuresOutput(double.NaN)
                 };
                 FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-                var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+                var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
                 {
                     Calculation = successfulCalculation,
                     AssessmentLayerOne = assessmentLayerOneState
@@ -658,9 +658,9 @@
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
 
-                var dataObject = view.Data as List<StabilityPointStructuresFailureMechanismSectionResult>;
+                var dataObject = view.Data as List<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>;
                 Assert.IsNotNull(dataObject);
-                StabilityPointStructuresFailureMechanismSectionResult row = dataObject.First();
+                StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> row = dataObject.First();
                 Assert.AreEqual(newValue, row.AssessmentLayerThree);
             }
         }
@@ -669,24 +669,24 @@
         {
             FailureMechanismSection section = CreateSimpleFailureMechanismSection();
 
-            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
+            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient
             }, "-").SetName("SectionWithoutCalculation");
-            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
+            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>()
             }, "-").SetName("SectionWithCalculationNoOutput");
-            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
+            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
                 {
                     Output = new TestStructuresOutput(double.NaN)
                 }
             }, "-").SetName("SectionWithInvalidCalculationOutput");
-            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
+            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r1aebb54c436f6c01043d5ca18f74a99d825f43db -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs)	(revision 1aebb54c436f6c01043d5ca18f74a99d825f43db)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -47,16 +47,16 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             // Call
             var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismSectionResultRow<StabilityPointStructuresFailureMechanismSectionResult>>(row);
-            Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA);
+            Assert.IsInstanceOf<FailureMechanismSectionResultRow<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>>(row);
+            Assert.AreEqual(result.GetAssessmentLayerTwoA(failureMechanism, assessmentSection), row.AssessmentLayerTwoA);
             Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree);
 
             TestHelper.AssertTypeConverter<StabilityPointStructuresFailureMechanismSectionResultRow, NoProbabilityValueDoubleConverter>(
@@ -75,7 +75,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Call
             TestDelegate call = () => new StabilityPointStructuresFailureMechanismSectionResultRow(result, null, assessmentSection);
@@ -91,7 +91,7 @@
         {
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Call
             TestDelegate call = () => new StabilityPointStructuresFailureMechanismSectionResultRow(
@@ -113,7 +113,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Precondition
             Assert.IsNull(sectionResult.Calculation);
@@ -146,7 +146,7 @@
             }
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 Calculation = calculation
             };
@@ -176,7 +176,7 @@
             };
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 Calculation = calculation
             };
@@ -202,7 +202,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Precondition
             Assert.IsNull(result.Calculation);
@@ -230,7 +230,7 @@
             var expectedCalculation = new StructuresCalculation<StabilityPointStructuresInput>();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StabilityPointStructuresFailureMechanismSectionResult(section)
+            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
             {
                 Calculation = expectedCalculation
             };
@@ -258,7 +258,7 @@
             var random = new Random(21);
             double assessmentLayerThree = random.NextDouble();
 
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var row = new StabilityPointStructuresFailureMechanismSectionResultRow(sectionResult, failureMechanism, assessmentSection);
 
             // Call
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenarioRowTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenarioRowTest.cs	(.../StabilityPointStructuresScenarioRowTest.cs)	(revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenarioRowTest.cs	(.../StabilityPointStructuresScenarioRowTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -44,7 +44,7 @@
                 new Point2D(1.1, 2.2),
                 new Point2D(3.3, 4.4)
             });
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             // Call
             var row = new StabilityPointStructuresScenarioRow(sectionResult);
@@ -75,7 +75,7 @@
                 new Point2D(1.1, 2.2),
                 new Point2D(3.3, 4.4)
             });
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
 
             var row = new StabilityPointStructuresScenarioRow(sectionResult);
 
@@ -103,7 +103,7 @@
                 new Point2D(1.1, 2.2),
                 new Point2D(3.3, 4.4)
             });
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
+            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
             sectionResult.Attach(observer);
 
             var row = new StabilityPointStructuresScenarioRow(sectionResult);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs
===================================================================
diff -u -r9540d67453c6a1caf5833d64ab651660dce11595 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs	(.../StabilityPointStructureReplaceDataStrategyTest.cs)	(revision 9540d67453c6a1caf5833d64ab651660dce11595)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs	(.../StabilityPointStructureReplaceDataStrategyTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.IO.Structures;
@@ -359,7 +360,7 @@
             {
                 location
             }));
-            StabilityPointStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult = failureMechanism.SectionResults.First();
             sectionResult.Calculation = calculation;
 
             StructureCollection<StabilityPointStructure> targetCollection = failureMechanism.StabilityPointStructures;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs	(.../StabilityPointStructuresUpdateDataStrategyTest.cs)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs	(.../StabilityPointStructuresUpdateDataStrategyTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -634,7 +634,7 @@
                                                                          failureMechanism.Calculations
                                                                                          .Cast<StructuresCalculation<StabilityPointStructuresInput>>());
 
-            StabilityPointStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults.ToArray();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>[] sectionResults = failureMechanism.SectionResults.ToArray();
 
             var strategy = new StabilityPointStructureUpdateDataStrategy(failureMechanism);
 
@@ -706,7 +706,7 @@
             StructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults,
                                                                          failureMechanism.Calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>());
 
-            StabilityPointStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults.ToArray();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>[] sectionResults = failureMechanism.SectionResults.ToArray();
 
             var strategy = new StabilityPointStructureUpdateDataStrategy(failureMechanism);
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs
===================================================================
diff -u -rfb1234bf64085a67f7b277ca86d39f80e15ff644 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision fb1234bf64085a67f7b277ca86d39f80e15ff644)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -26,6 +26,7 @@
 using Core.Common.Gui.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.StabilityPointStructures.Data;
@@ -100,7 +101,7 @@
                 // Assert
                 Assert.AreEqual(8, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresFailureMechanismContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructure)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresScenariosContext)));
@@ -129,8 +130,8 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>),
-                    typeof(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult>),
+                    typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>),
+                    typeof(IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>),
                     typeof(StabilityPointStructuresFailureMechanismResultView));
 
                 PluginTestHelper.AssertViewInfoDefined(
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfb1234bf64085a67f7b277ca86d39f80e15ff644 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision fb1234bf64085a67f7b277ca86d39f80e15ff644)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -28,6 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.Properties;
 using Ringtoets.StabilityPointStructures.Data;
@@ -46,7 +47,7 @@
         {
             mocks = new MockRepository();
             plugin = new StabilityPointStructuresPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>));
         }
 
         [TearDown]
@@ -91,7 +92,7 @@
             mocks.ReplayAll();
 
             var mechanism = new StabilityPointStructuresFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
                 mechanism.SectionResults, mechanism, assessmentSection);
 
             // Call
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -racb45246d666b955705c808a110fa23f4e650a5c -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision acb45246d666b955705c808a110fa23f4e650a5c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -42,7 +42,6 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
@@ -722,8 +721,13 @@
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
             var failureMechanism = new TestStabilityPointStructuresFailureMechanism();
             var parent = new CalculationGroup();
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
-            calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = new TestForeshoreProfile()
+                }
+            };
 
             var nodeData = new StabilityPointStructuresCalculationContext(calculation,
                                                                           parent,
@@ -763,8 +767,13 @@
 
             var foreshoreProfileInput = new TestForeshoreProfile();
             var parent = new CalculationGroup();
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
-            calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = foreshoreProfileInput
+                }
+            };
             TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new StabilityPointStructuresCalculationContext(calculation,
@@ -1142,7 +1151,7 @@
                 new Point2D(0, 0)
             }));
 
-            StabilityPointStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result = failureMechanism.SectionResults.First();
             result.Calculation = elementToBeRemoved;
 
             // Call
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 39e18750ccb61ad1f367279f9dac39a232d4f843)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -1701,7 +1701,7 @@
             var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             group.Children.Add(calculation);
 
-            StabilityPointStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result = failureMechanism.SectionResults.First();
             result.Calculation = calculation;
 
             // Call
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfb1234bf64085a67f7b277ca86d39f80e15ff644 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision fb1234bf64085a67f7b277ca86d39f80e15ff644)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -156,7 +156,7 @@
                 Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism);
                 Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData);
 
-                var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>) outputsFolder.Contents.ElementAt(1);
+                var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>) outputsFolder.Contents.ElementAt(1);
                 Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
                 Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
                 Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs
===================================================================
diff -u -r68ec2e96b004450e3b884fac10d1e7f6d7f18935 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs	(.../StabilityPointStructuresResultViewInfoTest.cs)	(revision 68ec2e96b004450e3b884fac10d1e7f6d7f18935)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs	(.../StabilityPointStructuresResultViewInfoTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -29,6 +29,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
@@ -61,8 +62,8 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>), info.DataType);
-            Assert.AreEqual(typeof(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult>), info.ViewDataType);
+            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>), info.DataType);
+            Assert.AreEqual(typeof(IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>), info.ViewDataType);
         }
 
         [Test]
@@ -74,7 +75,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
                 failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
@@ -305,7 +306,7 @@
             view.Expect(v => v.FailureMechanism = failureMechanism);
             mocks.ReplayAll();
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
                 failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
@@ -324,7 +325,7 @@
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
                 failureMechanism.SectionResults,
                 failureMechanism,
                 assessmentSection);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -r56246f10e7876b30f36a5b9709ec2e3332b4010a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs	(.../StabilityPointStructuresDataSynchronizationServiceTest.cs)	(revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs	(.../StabilityPointStructuresDataSynchronizationServiceTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
@@ -164,16 +164,16 @@
                                                                                                                .Cast<StructuresCalculation<StabilityPointStructuresInput>>()
                                                                                                                .Where(c => ReferenceEquals(c.InputParameters.Structure, structure))
                                                                                                                .ToArray();
-            StabilityPointStructuresFailureMechanismSectionResult[] sectionResultsWithStructure = failureMechanism.SectionResults
-                                                                                                                  .Where(sr => calculationsWithStructure.Contains(sr.Calculation))
-                                                                                                                  .ToArray();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>[] sectionResultsWithStructure = failureMechanism.SectionResults
+                                                                                                                                   .Where(sr => calculationsWithStructure.Contains(sr.Calculation))
+                                                                                                                                   .ToArray();
             StructuresCalculation<StabilityPointStructuresInput>[] calculationsWithOutput = calculationsWithStructure.Where(c => c.HasOutput)
                                                                                                                      .ToArray();
 
             int originalNumberOfSectionResultAssignments = failureMechanism.SectionResults.Count(sr => sr.Calculation != null);
-            StabilityPointStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults
-                                                                                                     .Where(sr => calculationsWithStructure.Contains(sr.Calculation))
-                                                                                                     .ToArray();
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>[] sectionResults = failureMechanism.SectionResults
+                                                                                                                      .Where(sr => calculationsWithStructure.Contains(sr.Calculation))
+                                                                                                                      .ToArray();
 
             // Precondition
             CollectionAssert.IsNotEmpty(calculationsWithOutput);
@@ -191,11 +191,13 @@
             {
                 Assert.IsNull(calculation.InputParameters.Structure);
             }
+
             foreach (StructuresCalculation<StabilityPointStructuresInput> calculation in calculationsWithOutput)
             {
                 Assert.IsFalse(calculation.HasOutput);
             }
-            foreach (StabilityPointStructuresFailureMechanismSectionResult sectionResult in sectionResultsWithStructure)
+
+            foreach (StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult in sectionResultsWithStructure)
             {
                 Assert.IsNull(sectionResult.Calculation);
             }
@@ -208,14 +210,17 @@
             {
                 CollectionAssert.Contains(array, calculation.InputParameters);
             }
+
             foreach (StructuresCalculation<StabilityPointStructuresInput> calculation in calculationsWithOutput)
             {
                 CollectionAssert.Contains(array, calculation);
             }
-            foreach (StabilityPointStructuresFailureMechanismSectionResult result in sectionResultsWithStructure)
+
+            foreach (StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result in sectionResultsWithStructure)
             {
                 CollectionAssert.Contains(array, result);
             }
+
             Assert.AreEqual(originalNumberOfSectionResultAssignments - sectionResults.Length, failureMechanism.SectionResults.Count(sr => sr.Calculation != null),
                             "Other section results with a different calculation/structure should still have their association.");
         }
@@ -291,10 +296,10 @@
 
             failureMechanism.AddSection(section1);
             failureMechanism.AddSection(section2);
-            StabilityPointStructuresFailureMechanismSectionResult result1 = failureMechanism.SectionResults
-                                                                                            .First(sr => ReferenceEquals(sr.Section, section1));
-            StabilityPointStructuresFailureMechanismSectionResult result2 = failureMechanism.SectionResults
-                                                                                            .First(sr => ReferenceEquals(sr.Section, section2));
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result1 = failureMechanism.SectionResults
+                                                                                                             .First(sr => ReferenceEquals(sr.Section, section1));
+            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> result2 = failureMechanism.SectionResults
+                                                                                                             .First(sr => ReferenceEquals(sr.Section, section2));
             result1.Calculation = calculation1;
             result2.Calculation = calculation2;