Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialRiskeerEntities.cs
===================================================================
diff -u -rdec02b06ef8f0eabe9bff6d68998003e7d39cc56 -r14f5d0472d2e32ddc67d0bb82c2f2aad84ba30b9
--- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialRiskeerEntities.cs	(.../PartialRiskeerEntities.cs)	(revision dec02b06ef8f0eabe9bff6d68998003e7d39cc56)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialRiskeerEntities.cs	(.../PartialRiskeerEntities.cs)	(revision 14f5d0472d2e32ddc67d0bb82c2f2aad84ba30b9)
@@ -112,6 +112,7 @@
             PipingCharacteristicPointEntities.Load();
             PipingFailureMechanismMetaEntities.Load();
             PipingSectionResultEntities.Load();
+            PipingScenarioConfigurationPerFailureMechanismSectionEntities.Load();
             PipingSoilLayerEntities.Load();
             PipingSoilProfileEntities.Load();
             PipingStructureFailureMechanismMetaEntities.Load();
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r14f5d0472d2e32ddc67d0bb82c2f2aad84ba30b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 14f5d0472d2e32ddc67d0bb82c2f2aad84ba30b9)
@@ -1185,6 +1185,7 @@
         private static void AssertPipingFailureMechanism(PipingFailureMechanism expectedFailureMechanism,
                                                          PipingFailureMechanism actualFailureMechanism)
         {
+            Assert.AreEqual(expectedFailureMechanism.ScenarioConfigurationType, actualFailureMechanism.ScenarioConfigurationType);
             AssertPipingProbabilityAssessmentInput(expectedFailureMechanism.PipingProbabilityAssessmentInput, actualFailureMechanism.PipingProbabilityAssessmentInput);
             AssertPipingStochasticSoilModels(expectedFailureMechanism.StochasticSoilModels, actualFailureMechanism.StochasticSoilModels);
             AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup);
@@ -1193,6 +1194,9 @@
             AssertCollectionAndItems(expectedFailureMechanism.SurfaceLines,
                                      actualFailureMechanism.SurfaceLines,
                                      AssertPipingSurfaceLine);
+            AssertCollectionAndItems(expectedFailureMechanism.ScenarioConfigurationsPerFailureMechanismSection,
+                                     actualFailureMechanism.ScenarioConfigurationsPerFailureMechanismSection,
+                                     AssertPipingScenarioConfigurationPerFailureMechanismSection);
         }
 
         private static void AssertFailureMechanismSectionResults(
@@ -1245,6 +1249,20 @@
             AssertPipingInput(expectedPipingCalculation.InputParameters, actualPipingCalculation.InputParameters);
         }
 
+        private static void AssertPipingScenarioConfigurationPerFailureMechanismSection(
+            PipingScenarioConfigurationPerFailureMechanismSection expectedConfiguration,
+            PipingScenarioConfigurationPerFailureMechanismSection actualConfiguration)
+        {
+            AssertFailureMechanismSections(new[]
+            {
+                expectedConfiguration.Section
+            }, new[]
+            {
+                actualConfiguration.Section
+            });
+            Assert.AreEqual(expectedConfiguration.ScenarioConfigurationType, actualConfiguration.ScenarioConfigurationType);
+        }
+
         private static void AssertPipingInput(PipingInput expectedPipingInput, PipingInput actualPipingInput)
         {
             AssertReferencedObject(() => expectedPipingInput.HydraulicBoundaryLocation,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r14f5d0472d2e32ddc67d0bb82c2f2aad84ba30b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 14f5d0472d2e32ddc67d0bb82c2f2aad84ba30b9)
@@ -138,6 +138,7 @@
             ConfigurePipingFailureMechanism(pipingFailureMechanism, assessmentSection);
             SetSections(pipingFailureMechanism);
             SetSectionResults(pipingFailureMechanism.SectionResultsOld);
+            SetSectionConfigurations(pipingFailureMechanism.ScenarioConfigurationsPerFailureMechanismSection);
 
             GrassCoverErosionInwardsFailureMechanism grassCoverErosionInwardsFailureMechanism = assessmentSection.GrassCoverErosionInwards;
             ConfigureGrassCoverErosionInwardsFailureMechanism(grassCoverErosionInwardsFailureMechanism, assessmentSection);
@@ -1240,6 +1241,15 @@
             }
         }
 
+        private static void SetSectionConfigurations(IEnumerable<PipingScenarioConfigurationPerFailureMechanismSection> sectionConfigurations)
+        {
+            var random = new Random(21);
+            foreach (PipingScenarioConfigurationPerFailureMechanismSection sectionConfiguration in sectionConfigurations)
+            {
+                sectionConfiguration.ScenarioConfigurationType = random.NextEnumValue<PipingScenarioConfigurationPerFailureMechanismSectionType>();
+            }
+        } 
+
         private static PipingSurfaceLine GetSurfaceLine()
         {
             var surfaceLine = new PipingSurfaceLine("Surface line")