Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rd3b94aacb873473ebe92d56b4e48341bf4b26412 -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs	(.../ClosingStructuresCalculationConfigurationImporterTest.cs)	(revision d3b94aacb873473ebe92d56b4e48341bf4b26412)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs	(.../ClosingStructuresCalculationConfigurationImporterTest.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -211,11 +211,9 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var importer = new ClosingStructuresCalculationConfigurationImporter("",
-                                                                                 new CalculationGroup(),
-                                                                                 Enumerable.Empty<HydraulicBoundaryLocation>(),
-                                                                                 Enumerable.Empty<ForeshoreProfile>(),
-                                                                                 Enumerable.Empty<ClosingStructure>());
+            var importer = new ClosingStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
+                Enumerable.Empty<ForeshoreProfile>(), Enumerable.Empty<ClosingStructure>());
 
             // AssertTC
             Assert.IsInstanceOf<CalculationConfigurationImporter<ClosingStructuresCalculationConfigurationReader, ClosingStructuresCalculationConfiguration>>(importer);
@@ -225,8 +223,9 @@
         public void Constructor_HydraulicBoundaryLocationsNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new ClosingStructuresCalculationConfigurationImporter("", new CalculationGroup(), null, Enumerable.Empty<ForeshoreProfile>(),
-                                                                                 Enumerable.Empty<ClosingStructure>());
+            void Call() => new ClosingStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), null, Enumerable.Empty<ForeshoreProfile>(),
+                Enumerable.Empty<ClosingStructure>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -237,8 +236,9 @@
         public void Constructor_ForeshoreProfilesNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new ClosingStructuresCalculationConfigurationImporter("", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
-                                                                                 null, Enumerable.Empty<ClosingStructure>());
+            void Call() => new ClosingStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
+                null, Enumerable.Empty<ClosingStructure>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -249,8 +249,9 @@
         public void Constructor_StructuresNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new ClosingStructuresCalculationConfigurationImporter("", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
-                                                                                 Enumerable.Empty<ForeshoreProfile>(), null);
+            void Call() => new ClosingStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
+                Enumerable.Empty<ForeshoreProfile>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs
===================================================================
diff -u -r65e9bbe5a99736fdc6e6dae703186816f07fa910 -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 65e9bbe5a99736fdc6e6dae703186816f07fa910)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -33,9 +33,7 @@
 namespace Riskeer.HeightStructures.Forms.Views
 {
     /// <summary>
-    /// View for configuring scenarios for the height structures failure mechanism.
-    /// Shows a grid view where for each failure mechanism section, a calculation within the section
-    /// can be selected.
+    /// View for configuring height structures scenarios.
     /// </summary>
     public partial class HeightStructuresScenariosView : ScenariosView<StructuresCalculationScenario<HeightStructuresInput>, HeightStructuresInput, HeightStructuresScenarioRow, HeightStructuresFailureMechanism>
     {
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r409c6cc771b57ea7531bef1405cbe60cf166b1de -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs	(.../HeightStructuresCalculationConfigurationImporter.cs)	(revision 409c6cc771b57ea7531bef1405cbe60cf166b1de)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs	(.../HeightStructuresCalculationConfigurationImporter.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -214,9 +214,7 @@
 
         private bool TrySetHydraulicBoundaryLocation(string locationName, StructuresCalculation<HeightStructuresInput> calculation)
         {
-            HydraulicBoundaryLocation location;
-
-            if (TryReadHydraulicBoundaryLocation(locationName, calculation.Name, availableHydraulicBoundaryLocations, out location))
+            if (TryReadHydraulicBoundaryLocation(locationName, calculation.Name, availableHydraulicBoundaryLocations, out HydraulicBoundaryLocation location))
             {
                 calculation.InputParameters.HydraulicBoundaryLocation = location;
                 return true;
@@ -227,9 +225,7 @@
 
         private bool TrySetStructure(string structureId, StructuresCalculation<HeightStructuresInput> calculation)
         {
-            HeightStructure structure;
-
-            if (TryReadStructure(structureId, calculation.Name, availableStructures, out structure))
+            if (TryReadStructure(structureId, calculation.Name, availableStructures, out HeightStructure structure))
             {
                 calculation.InputParameters.Structure = structure;
                 return true;
@@ -240,9 +236,7 @@
 
         private bool TrySetForeshoreProfile(string foreshoreProfileId, StructuresCalculation<HeightStructuresInput> calculation)
         {
-            ForeshoreProfile foreshoreProfile;
-
-            if (TryReadForeshoreProfile(foreshoreProfileId, calculation.Name, availableForeshoreProfiles, out foreshoreProfile))
+            if (TryReadForeshoreProfile(foreshoreProfileId, calculation.Name, availableForeshoreProfiles, out ForeshoreProfile foreshoreProfile))
             {
                 calculation.InputParameters.ForeshoreProfile = foreshoreProfile;
                 return true;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresScenariosContextTest.cs
===================================================================
diff -u -r33b37f9cbd7e2b5664fc666dab41ddd424ed3818 -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresScenariosContextTest.cs	(.../HeightStructuresScenariosContextTest.cs)	(revision 33b37f9cbd7e2b5664fc666dab41ddd424ed3818)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresScenariosContextTest.cs	(.../HeightStructuresScenariosContextTest.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -81,6 +81,7 @@
             Assert.IsInstanceOf<WrappedObjectContextBase<CalculationGroup>>(context);
             Assert.AreSame(calculationGroup, context.WrappedData);
             Assert.AreSame(failureMechanism, context.ParentFailureMechanism);
+            Assert.AreSame(assessmentSection, context.AssessmentSection);
             mocks.VerifyAll();
         }
     }
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r409c6cc771b57ea7531bef1405cbe60cf166b1de -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs	(.../HeightStructuresCalculationConfigurationImporterTest.cs)	(revision 409c6cc771b57ea7531bef1405cbe60cf166b1de)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs	(.../HeightStructuresCalculationConfigurationImporterTest.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -183,8 +183,8 @@
         {
             // Call
             void Call() => new HeightStructuresCalculationConfigurationImporter(
-                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(), null,
-                Enumerable.Empty<HeightStructure>());
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
+                null, Enumerable.Empty<HeightStructure>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -ra51d17f846f40d0336ed5252799cb32bf55df9d3 -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs	(.../StabilityPointStructuresCalculationConfigurationImporter.cs)	(revision a51d17f846f40d0336ed5252799cb32bf55df9d3)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs	(.../StabilityPointStructuresCalculationConfigurationImporter.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -487,9 +487,7 @@
 
         private bool TrySetHydraulicBoundaryLocation(string locationName, StructuresCalculation<StabilityPointStructuresInput> calculation)
         {
-            HydraulicBoundaryLocation location;
-
-            if (TryReadHydraulicBoundaryLocation(locationName, calculation.Name, availableHydraulicBoundaryLocations, out location))
+            if (TryReadHydraulicBoundaryLocation(locationName, calculation.Name, availableHydraulicBoundaryLocations, out HydraulicBoundaryLocation location))
             {
                 calculation.InputParameters.HydraulicBoundaryLocation = location;
                 return true;
@@ -500,9 +498,7 @@
 
         private bool TrySetStructure(string structureId, StructuresCalculation<StabilityPointStructuresInput> calculation)
         {
-            StabilityPointStructure structure;
-
-            if (TryReadStructure(structureId, calculation.Name, availableStructures, out structure))
+            if (TryReadStructure(structureId, calculation.Name, availableStructures, out StabilityPointStructure structure))
             {
                 calculation.InputParameters.Structure = structure;
                 return true;
@@ -513,9 +509,7 @@
 
         private bool TrySetForeshoreProfile(string foreshoreProfileName, StructuresCalculation<StabilityPointStructuresInput> calculation)
         {
-            ForeshoreProfile foreshoreProfile;
-
-            if (TryReadForeshoreProfile(foreshoreProfileName, calculation.Name, availableForeshoreProfiles, out foreshoreProfile))
+            if (TryReadForeshoreProfile(foreshoreProfileName, calculation.Name, availableForeshoreProfiles, out ForeshoreProfile foreshoreProfile))
             {
                 calculation.InputParameters.ForeshoreProfile = foreshoreProfile;
                 return true;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -ra51d17f846f40d0336ed5252799cb32bf55df9d3 -r1a080d1011da380e86370793a7f2ed532a6a0b42
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs	(.../StabilityPointStructuresCalculationConfigurationImporterTest.cs)	(revision a51d17f846f40d0336ed5252799cb32bf55df9d3)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs	(.../StabilityPointStructuresCalculationConfigurationImporterTest.cs)	(revision 1a080d1011da380e86370793a7f2ed532a6a0b42)
@@ -474,12 +474,9 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var importer = new StabilityPointStructuresCalculationConfigurationImporter("",
-                                                                                        new CalculationGroup(),
-                                                                                        Enumerable.Empty<HydraulicBoundaryLocation>(),
-                                                                                        Enumerable.Empty<ForeshoreProfile>(),
-                                                                                        Enumerable.Empty<StabilityPointStructure>(),
-                                                                                        new StabilityPointStructuresFailureMechanism());
+            var importer = new StabilityPointStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(), Enumerable.Empty<ForeshoreProfile>(),
+                Enumerable.Empty<StabilityPointStructure>(), new StabilityPointStructuresFailureMechanism());
 
             // Assert
             Assert.IsInstanceOf<CalculationConfigurationImporter<StabilityPointStructuresCalculationConfigurationReader,
@@ -490,8 +487,9 @@
         public void Constructor_HydraulicBoundaryLocationsNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new StabilityPointStructuresCalculationConfigurationImporter("", new CalculationGroup(), null, Enumerable.Empty<ForeshoreProfile>(),
-                                                                                        Enumerable.Empty<StabilityPointStructure>(), new StabilityPointStructuresFailureMechanism());
+            void Call() => new StabilityPointStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), null, Enumerable.Empty<ForeshoreProfile>(),
+                Enumerable.Empty<StabilityPointStructure>(), new StabilityPointStructuresFailureMechanism());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -502,8 +500,9 @@
         public void Constructor_ForeshoreProfilesNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new StabilityPointStructuresCalculationConfigurationImporter("", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(), null,
-                                                                                        Enumerable.Empty<StabilityPointStructure>(), new StabilityPointStructuresFailureMechanism());
+            void Call() => new StabilityPointStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(), null,
+                Enumerable.Empty<StabilityPointStructure>(), new StabilityPointStructuresFailureMechanism());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -514,8 +513,9 @@
         public void Constructor_StructuresNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new StabilityPointStructuresCalculationConfigurationImporter("", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(), Enumerable.Empty<ForeshoreProfile>(),
-                                                                                        null, new StabilityPointStructuresFailureMechanism());
+            void Call() => new StabilityPointStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
+                Enumerable.Empty<ForeshoreProfile>(), null, new StabilityPointStructuresFailureMechanism());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -526,8 +526,9 @@
         public void Constructor_FailureMechanismNull_ThrowArgumentNullException()
         {
             // Call
-            void Call() => new StabilityPointStructuresCalculationConfigurationImporter("", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(),
-                                                                                        Enumerable.Empty<ForeshoreProfile>(), Enumerable.Empty<StabilityPointStructure>(), null);
+            void Call() => new StabilityPointStructuresCalculationConfigurationImporter(
+                "", new CalculationGroup(), Enumerable.Empty<HydraulicBoundaryLocation>(), 
+                Enumerable.Empty<ForeshoreProfile>(), Enumerable.Empty<StabilityPointStructure>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);