Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs
===================================================================
diff -u -r907f25f4a15204ce1b1ba29d0ada4410d1914930 -r67bb0f147b6d48541b2e903dddf771e8042b3b9b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs	(.../HydraRingConfiguration.cs)	(revision 907f25f4a15204ce1b1ba29d0ada4410d1914930)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs	(.../HydraRingConfiguration.cs)	(revision 67bb0f147b6d48541b2e903dddf771e8042b3b9b)
@@ -25,6 +25,7 @@
 using System.Globalization;
 using System.Linq;
 using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Settings;
 using Ringtoets.HydraRing.Calculation.Types;
 
 namespace Ringtoets.HydraRing.Calculation
@@ -42,7 +43,7 @@
     {
         private readonly IList<HydraRingCalculationData> hydraRingCalculations;
         private readonly IDictionary<HydraRingFailureMechanismType, DefaultsPerFailureMechanism> defaultsPerFailureMechanism;
-        private readonly IEnumerable<HydraRingConfigurationSettings> configurationPerSubMechanism;
+        private readonly IEnumerable<SubMechanismSettings> subMechanismSettings;
 
         /// <summary>
         /// Creates a new instance of the <see cref="HydraRingConfiguration"/> class.
@@ -144,9 +145,9 @@
                 }
             };
 
-            configurationPerSubMechanism = new[]
+            subMechanismSettings = new[]
             {
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel,
                     SubMechanismId = 1,
@@ -165,7 +166,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.WaveHeight,
                     SubMechanismId = 11,
@@ -184,7 +185,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.WavePeakPeriod,
                     SubMechanismId = 14,
@@ -203,7 +204,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.WaveSpectralPeriod,
                     SubMechanismId = 16,
@@ -222,7 +223,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.QVariant,
                     SubMechanismId = 3,
@@ -241,7 +242,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.QVariant,
                     SubMechanismId = 4,
@@ -260,7 +261,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.QVariant,
                     SubMechanismId = 5,
@@ -279,7 +280,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping,
                     SubMechanismId = 102,
@@ -298,7 +299,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping,
                     SubMechanismId = 103,
@@ -317,7 +318,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.DikesPiping,
                     SubMechanismId = 311,
@@ -336,7 +337,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.DikesPiping,
                     SubMechanismId = 313,
@@ -355,7 +356,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.DikesPiping,
                     SubMechanismId = 314,
@@ -374,7 +375,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping,
                     SubMechanismId = 421,
@@ -393,7 +394,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping,
                     SubMechanismId = 422,
@@ -412,7 +413,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping,
                     SubMechanismId = 423,
@@ -431,7 +432,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresClosure,
                     SubMechanismId = 422,
@@ -450,7 +451,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresClosure,
                     SubMechanismId = 424,
@@ -469,7 +470,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresClosure,
                     SubMechanismId = 425,
@@ -488,7 +489,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresClosure,
                     SubMechanismId = 426,
@@ -507,7 +508,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresClosure,
                     SubMechanismId = 427,
@@ -526,7 +527,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 422,
@@ -545,7 +546,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 424,
@@ -564,7 +565,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 425,
@@ -583,7 +584,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 430,
@@ -602,7 +603,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 431,
@@ -621,7 +622,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 432,
@@ -640,7 +641,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 433,
@@ -659,7 +660,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 434,
@@ -678,7 +679,7 @@
                     NiUMax = 6.0,
                     NiNumberSteps = 25
                 },
-                new HydraRingConfigurationSettings
+                new SubMechanismSettings
                 {
                     FailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
                     SubMechanismId = 435,
@@ -878,7 +879,7 @@
 
                 foreach (var subMechanimsId in defaultsForFailureMechanism.SubMechanismIds)
                 {
-                    var configurationForSubMechanism = configurationPerSubMechanism.First(cs => cs.FailureMechanismType == hydraRingCalculation.FailureMechanismType && cs.SubMechanismId == subMechanimsId);
+                    var configurationForSubMechanism = subMechanismSettings.First(cs => cs.FailureMechanismType == hydraRingCalculation.FailureMechanismType && cs.SubMechanismId == subMechanimsId);
 
                     orderDictionaries.Add(new OrderedDictionary
                     {
Fisheye: Tag 67bb0f147b6d48541b2e903dddf771e8042b3b9b refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r907f25f4a15204ce1b1ba29d0ada4410d1914930 -r67bb0f147b6d48541b2e903dddf771e8042b3b9b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 907f25f4a15204ce1b1ba29d0ada4410d1914930)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 67bb0f147b6d48541b2e903dddf771e8042b3b9b)
@@ -43,7 +43,7 @@
     <Compile Include="Data\HydraRingCalculationData.cs" />
     <Compile Include="Types\HydraRingFailureMechanismType.cs" />
     <Compile Include="HydraRingConfiguration.cs" />
-    <Compile Include="HydraRingConfigurationSettings.cs" />
+    <Compile Include="Settings\SubMechanismSettings.cs" />
     <Compile Include="Data\HydraulicCalculationData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Types\HydraRingTimeIntegrationSchemeType.cs" />
@@ -263,6 +263,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/SubMechanismSettings.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/SubMechanismSettings.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/SubMechanismSettings.cs	(revision 67bb0f147b6d48541b2e903dddf771e8042b3b9b)
@@ -0,0 +1,120 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Ringtoets.HydraRing.Calculation.Types;
+
+namespace Ringtoets.HydraRing.Calculation.Settings
+{
+    /// <summary>
+    /// Container for sub mechanims settings, uniquely identified by the combination of:
+    /// - SectionID
+    /// - <see cref="FailureMechanismType"/>
+    /// - <see cref="SubMechanismId"/>
+    /// </summary>
+    public class SubMechanismSettings
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="HydraRingFailureMechanismType"/>.
+        /// </summary>
+        public HydraRingFailureMechanismType FailureMechanismType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id of the sub mechanism.
+        /// </summary>
+        public int SubMechanismId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id of the calculation technique that should be used.
+        /// </summary>
+        public int CalculationTechniqueId { get; set; }
+
+        /// <summary>
+        /// Gets or set the FORM start method.
+        /// </summary>
+        public int FormStartMethod { get; set; }
+
+        /// <summary>
+        /// Gets or set the maximum number of FORM iterations to perform.
+        /// </summary>
+        public int FormNumberOfIterations { get; set; }
+
+        /// <summary>
+        /// Gets or set a relaxation towards the design point for FORM.
+        /// </summary>
+        public double FormRelaxationFactor { get; set; }
+
+        /// <summary>
+        /// Gets or set one of the three convergence criteria for FORM.
+        /// </summary>
+        /// <seealso cref="FormEpsHOH"/>
+        /// <seealso cref="FormEpsZFunc"/>
+        public double FormEpsBeta { get; set; }
+
+        /// <summary>
+        /// Gets or set one of the three convergence criteria for FORM.
+        /// </summary>
+        /// <seealso cref="FormEpsBeta"/>
+        /// <seealso cref="FormEpsZFunc"/>
+        public double FormEpsHOH { get; set; }
+
+        /// <summary>
+        /// Gets or set one of the three convergence criteria for FORM.
+        /// </summary>
+        /// <seealso cref="FormEpsBeta"/>
+        /// <seealso cref="FormEpsHOH"/>
+        public double FormEpsZFunc { get; set; }
+
+        /// <summary>
+        /// Gets or set the DIRS start method.
+        /// </summary>
+        public int DsStartMethod { get; set; }
+
+        /// <summary>
+        /// Gets or set the minimum number of DIRS iterations to perform.
+        /// </summary>
+        public int DsMinNumberOfIterations { get; set; }
+
+        /// <summary>
+        /// Gets or set the maximum number of DIRS iterations to perform.
+        /// </summary>
+        public int DsMaxNumberOfIterations { get; set; }
+
+        /// <summary>
+        /// Gets or set the variation coefficient to use within the DIRS iterations.
+        /// </summary>
+        public double DsVarCoefficient { get; set; }
+
+        /// <summary>
+        /// Gets or set the lower size limit of a uniform grid deployed by NINT.
+        /// </summary>
+        public double NiUMin { get; set; }
+
+        /// <summary>
+        /// Gets or set the upper size limit of a uniform grid deployed by NINT.
+        /// </summary>
+        public double NiUMax { get; set; }
+
+        /// <summary>
+        /// Gets or set the number of steps between <seealso cref="NiUMin"/> and <seealso cref="NiUMax"/> for NINT.
+        /// </summary>
+        public int NiNumberSteps { get; set; }
+    }
+}
\ No newline at end of file