Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs	(.../HeightStructuresCalculationEntityReadExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs	(.../HeightStructuresCalculationEntityReadExtensions.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -44,8 +44,8 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="StructuresCalculation{T}"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
-        internal static StructuresCalculation<HeightStructuresInput> Read(this HeightStructuresCalculationEntity entity,
-                                                                          ReadConversionCollector collector)
+        internal static StructuresCalculationScenario<HeightStructuresInput> Read(this HeightStructuresCalculationEntity entity,
+                                                                                  ReadConversionCollector collector)
         {
             if (collector == null)
             {
@@ -57,7 +57,7 @@
                 return collector.Get(entity);
             }
 
-            var calculation = new StructuresCalculation<HeightStructuresInput>
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>
             {
                 Name = entity.Name,
                 Comments =
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs
===================================================================
diff -u -re57aa3c1ceb99466236e146782608821842dc2b9 -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -99,8 +99,8 @@
         private readonly Dictionary<StabilityPointStructureEntity, StabilityPointStructure> stabilityPointStructures =
             CreateDictionary<StabilityPointStructureEntity, StabilityPointStructure>();
 
-        private readonly Dictionary<HeightStructuresCalculationEntity, StructuresCalculation<HeightStructuresInput>> heightStructuresCalculations =
-            CreateDictionary<HeightStructuresCalculationEntity, StructuresCalculation<HeightStructuresInput>>();
+        private readonly Dictionary<HeightStructuresCalculationEntity, StructuresCalculationScenario<HeightStructuresInput>> heightStructuresCalculations =
+            CreateDictionary<HeightStructuresCalculationEntity, StructuresCalculationScenario<HeightStructuresInput>>();
 
         private readonly Dictionary<ClosingStructuresCalculationEntity, StructuresCalculationScenario<ClosingStructuresInput>> closingStructuresCalculations =
             CreateDictionary<ClosingStructuresCalculationEntity, StructuresCalculationScenario<ClosingStructuresInput>>();
@@ -1254,7 +1254,7 @@
         /// <param name="model">The <see cref="StructuresCalculation{T}"/> that
         /// was constructed.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        internal void Read(HeightStructuresCalculationEntity entity, StructuresCalculation<HeightStructuresInput> model)
+        internal void Read(HeightStructuresCalculationEntity entity, StructuresCalculationScenario<HeightStructuresInput> model)
         {
             if (entity == null)
             {
@@ -1297,7 +1297,7 @@
         /// been registered for <paramref name="entity"/>.</exception>
         /// <remarks>Use <see cref="Contains(HeightStructuresCalculationEntity)"/>
         /// to find out whether a read operation has been registered for <paramref name="entity"/>.</remarks>
-        internal StructuresCalculation<HeightStructuresInput> Get(HeightStructuresCalculationEntity entity)
+        internal StructuresCalculationScenario<HeightStructuresInput> Get(HeightStructuresCalculationEntity entity)
         {
             if (entity == null)
             {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -re57aa3c1ceb99466236e146782608821842dc2b9 -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -535,9 +535,9 @@
                     AssertGrassCoverErosionOutwardsWaveConditionsCalculation(expectedGrassCoverErosionOutwardsCalculation, (GrassCoverErosionOutwardsWaveConditionsCalculation) actualChild);
                 }
 
-                if (expectedChild is StructuresCalculation<HeightStructuresInput> expectedHeightStructuresCalculation)
+                if (expectedChild is StructuresCalculationScenario<HeightStructuresInput> expectedHeightStructuresCalculation)
                 {
-                    AssertStructuresCalculation(expectedHeightStructuresCalculation, (StructuresCalculation<HeightStructuresInput>) actualChild);
+                    AssertStructuresCalculation(expectedHeightStructuresCalculation, (StructuresCalculationScenario<HeightStructuresInput>) actualChild);
                 }
 
                 if (expectedChild is StructuresCalculationScenario<ClosingStructuresInput> expectedClosingStructuresCalculation)
@@ -958,6 +958,8 @@
                                                         StructuresCalculationScenario<ClosingStructuresInput> actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
+            Assert.AreEqual(expectedCalculation.IsRelevant, actualCalculation.IsRelevant);
+            Assert.AreEqual(expectedCalculation.Contribution, actualCalculation.Contribution);
             AssertComments(expectedCalculation.Comments, actualCalculation.Comments);
 
             AssertClosingStructuresInput(expectedCalculation.InputParameters, actualCalculation.InputParameters);
@@ -1132,15 +1134,6 @@
                                          Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability, 1e-6);
                                          Assert.AreEqual(expectedItem.UseManualAssembly, actualItem.UseManualAssembly);
                                          Assert.AreEqual(expectedItem.ManualAssemblyProbability, actualItem.ManualAssemblyProbability, 1e-6);
-
-                                         if (expectedItem.Calculation == null)
-                                         {
-                                             Assert.IsNull(actualItem.Calculation);
-                                         }
-                                         else
-                                         {
-                                             AssertStructuresCalculation(expectedItem.Calculation, actualItem.Calculation);
-                                         }
                                      });
         }
 
@@ -1170,10 +1163,12 @@
             DistributionAssert.AreEqual(expectedHeightStructure.AllowedLevelIncreaseStorage, actualHeightStructure.AllowedLevelIncreaseStorage);
         }
 
-        private static void AssertStructuresCalculation(StructuresCalculation<HeightStructuresInput> expectedCalculation,
-                                                        StructuresCalculation<HeightStructuresInput> actualCalculation)
+        private static void AssertStructuresCalculation(StructuresCalculationScenario<HeightStructuresInput> expectedCalculation,
+                                                        StructuresCalculationScenario<HeightStructuresInput> actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
+            Assert.AreEqual(expectedCalculation.IsRelevant, actualCalculation.IsRelevant);
+            Assert.AreEqual(expectedCalculation.Contribution, actualCalculation.Contribution);
             AssertComments(expectedCalculation.Comments, actualCalculation.Comments);
 
             AssertHeightStructuresInput(expectedCalculation.InputParameters, actualCalculation.InputParameters);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs	(.../HeightStructuresCalculationEntityReadExtensionsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs	(.../HeightStructuresCalculationEntityReadExtensionsTest.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -218,7 +218,7 @@
                 }
             };
 
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>();
 
             var collector = new ReadConversionCollector();
             collector.Read(entity, calculation);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -146,7 +146,7 @@
         public void Read_CalculationEntitySet_ReturnHeightStructuresSectionResultWithCalculation()
         {
             // Setup
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>();
 
             var calculationEntity = new HeightStructuresCalculationEntity();
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -re57aa3c1ceb99466236e146782608821842dc2b9 -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -373,17 +373,17 @@
         }
 
         [TestFixture]
-        private class HeightStructureCalculationCollectorTest : CollectorTest<StructuresCalculation<HeightStructuresInput>,
+        private class HeightStructureCalculationCollectorTest : CollectorTest<StructuresCalculationScenario<HeightStructuresInput>,
             HeightStructuresCalculationEntity>
         {
             public HeightStructureCalculationCollectorTest() : base(
                 (c, e, m) => c.Read(e, m),
                 (c, e) => c.Contains(e),
                 (c, e) => c.Get(e)) {}
 
-            protected override StructuresCalculation<HeightStructuresInput> CreateDataModel()
+            protected override StructuresCalculationScenario<HeightStructuresInput> CreateDataModel()
             {
-                return new StructuresCalculation<HeightStructuresInput>();
+                return new StructuresCalculationScenario<HeightStructuresInput>();
             }
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -re57aa3c1ceb99466236e146782608821842dc2b9 -red11c91a52b5418784ec7327ee15abb6ddda69a2
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
@@ -881,7 +881,7 @@
                 Name = "Height structures A",
                 Children =
                 {
-                    new StructuresCalculation<HeightStructuresInput>
+                    new StructuresCalculationScenario<HeightStructuresInput>
                     {
                         InputParameters =
                         {
@@ -900,7 +900,7 @@
                         },
                         Output = new StructuresOutput(0.11, null)
                     },
-                    new StructuresCalculation<HeightStructuresInput>
+                    new StructuresCalculationScenario<HeightStructuresInput>
                     {
                         InputParameters =
                         {
@@ -925,7 +925,7 @@
             {
                 Name = "Height structures B"
             });
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<HeightStructuresInput>());
         }
 
         private static void SetSectionResults(IEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults,