Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs	(.../ExceedanceProbabilityCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs	(.../ExceedanceProbabilityCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -33,12 +33,6 @@
         /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic boundary location to use during the calculation.</param>
         protected ExceedanceProbabilityCalculationInput(long hydraulicBoundaryLocationId) : base(hydraulicBoundaryLocationId) {}
 
-        public override int CalculationTypeId
-        {
-            get
-            {
-                return 1;
-            }
-        }
+        public override int CalculationTypeId => 1;
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs	(.../HydraRingCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs	(.../HydraRingCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -75,6 +75,11 @@
         public abstract int VariableId { get; }
 
         /// <summary>
+        /// Gets the fault tree model id.
+        /// </summary>
+        public abstract int FaultTreeModelId { get; }
+
+        /// <summary>
         /// Gets the id of the hydraulic boundary location to use during the calculation.
         /// </summary>
         public long HydraulicBoundaryLocationId { get; }
@@ -120,36 +125,18 @@
         /// <summary>
         /// Gets the break water to use during the calculation.
         /// </summary>
-        public virtual HydraRingBreakWater BreakWater
-        {
-            get
-            {
-                return null;
-            }
-        }
+        public virtual HydraRingBreakWater BreakWater => null;
 
         /// <summary>
         /// Gets the reliability index to use during the calculation.
         /// </summary>
         /// <remarks>Only relevant for calculations that iterate towards a reliability index.</remarks>
-        public virtual double Beta
-        {
-            get
-            {
-                return double.NaN;
-            }
-        }
+        public virtual double Beta => double.NaN;
 
         /// <summary>
         /// Gets the iteration method id to use during the calculation.
         /// </summary>
-        public virtual int IterationMethodId
-        {
-            get
-            {
-                return 3;
-            }
-        }
+        public virtual int IterationMethodId => 3;
 
         /// <summary>
         /// Gets the sub mechanism model id corresponding to the provided sub mechanism id.
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs	(.../AssessmentLevelCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs	(.../AssessmentLevelCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -41,22 +41,12 @@
             Section = new HydraRingSection(sectionId, double.NaN, double.NaN);
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType
-        {
-            get
-            {
-                return HydraRingFailureMechanismType.AssessmentLevel;
-            }
-        }
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.AssessmentLevel;
 
-        public override int VariableId
-        {
-            get
-            {
-                return 26;
-            }
-        }
+        public override int VariableId => 26;
 
+        public override int FaultTreeModelId => 1;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs	(.../DunesBoundaryConditionsCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs	(.../DunesBoundaryConditionsCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -38,5 +38,7 @@
         public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.DunesBoundaryConditions;
 
         public override int CalculationTypeId { get; } = 2;
+
+        public override int FaultTreeModelId => 8;
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs	(.../HydraulicLoadsCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs	(.../HydraulicLoadsCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -120,6 +120,8 @@
 
         public override HydraRingSection Section { get; }
 
+        public override int FaultTreeModelId => 1017;
+
         public override IEnumerable<HydraRingProfilePoint> ProfilePoints { get; }
 
         public override IEnumerable<HydraRingForelandPoint> ForelandsPoints { get; }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs	(.../OvertoppingRateCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs	(.../OvertoppingRateCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -102,13 +102,7 @@
 
         public override int VariableId { get; } = 17;
 
-        public override int CalculationTypeId
-        {
-            get
-            {
-                return 2;
-            }
-        }
+        public override int CalculationTypeId => 2;
 
         public override IEnumerable<HydraRingVariable> Variables
         {
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs	(.../WaveHeightCalculationInput .cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs	(.../WaveHeightCalculationInput .cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -41,22 +41,12 @@
             Section = new HydraRingSection(sectionId, double.NaN, double.NaN);
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType
-        {
-            get
-            {
-                return HydraRingFailureMechanismType.WaveHeight;
-            }
-        }
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.WaveHeight;
 
-        public override int VariableId
-        {
-            get
-            {
-                return 28;
-            }
-        }
+        public override int VariableId => 28;
 
+        public override int FaultTreeModelId => 11;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -130,6 +130,8 @@
 
         public override int VariableId { get; } = 1;
 
+        public override int FaultTreeModelId => 1017;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs
===================================================================
diff -u -ra43f2c340ceb6ca17f2b75b4d365fb6ae915a96f -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs	(.../PipingCalculationInput.cs)	(revision a43f2c340ceb6ca17f2b75b4d365fb6ae915a96f)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs	(.../PipingCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -234,6 +234,8 @@
 
         public override int VariableId { get; } = 58;
 
+        public override int FaultTreeModelId => hasCoverageLayer ? 3015 : 3014;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs	(.../ReliabilityIndexCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs	(.../ReliabilityIndexCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -40,13 +40,7 @@
             Beta = StatisticsConverter.ProbabilityToReliability(norm);
         }
 
-        public override int CalculationTypeId
-        {
-            get
-            {
-                return 9;
-            }
-        }
+        public override int CalculationTypeId => 9;
 
         public override double Beta { get; }
     }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs	(.../StructuresClosureCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs	(.../StructuresClosureCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -126,6 +126,8 @@
 
         public override int VariableId { get; } = 58;
 
+        public override int FaultTreeModelId => 4505;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
@@ -153,13 +155,7 @@
 
         public override HydraRingBreakWater BreakWater { get; }
 
-        public override int IterationMethodId
-        {
-            get
-            {
-                return 6;
-            }
-        }
+        public override int IterationMethodId => 6;
 
         public abstract override int? GetSubMechanismModelId(int subMechanismId);
     }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -142,6 +142,8 @@
 
         public override int VariableId { get; } = 60;
 
+        public override int FaultTreeModelId => 4404;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
@@ -170,12 +172,6 @@
 
         public override HydraRingBreakWater BreakWater { get; }
 
-        public override int IterationMethodId
-        {
-            get
-            {
-                return 6;
-            }
-        }
+        public override int IterationMethodId => 6;
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs	(.../StructuresStabilityPointCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs	(.../StructuresStabilityPointCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -237,6 +237,8 @@
 
         public override int VariableId { get; } = 58;
 
+        public override int FaultTreeModelId => 4607;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
@@ -282,13 +284,7 @@
 
         public override HydraRingBreakWater BreakWater { get; }
 
-        public override int IterationMethodId
-        {
-            get
-            {
-                return 6;
-            }
-        }
+        public override int IterationMethodId => 6;
 
         public abstract override int? GetSubMechanismModelId(int subMechanismId);
     }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs	(.../WaveConditionsCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs	(.../WaveConditionsCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -68,30 +68,14 @@
             this.b = b;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType
-        {
-            get
-            {
-                return HydraRingFailureMechanismType.QVariant;
-            }
-        }
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.QVariant;
 
-        public override int CalculationTypeId
-        {
-            get
-            {
-                return 8;
-            }
-        }
+        public override int CalculationTypeId => 8;
 
-        public override int VariableId
-        {
-            get
-            {
-                return 114;
-            }
-        }
+        public override int VariableId => 114;
 
+        public override int FaultTreeModelId => 6;
+
         public override HydraRingSection Section { get; }
 
         public override IEnumerable<HydraRingVariable> Variables
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs	(.../AssessmentLevelCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs	(.../AssessmentLevelCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -49,6 +49,7 @@
             Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, assessmentLevelCalculationInput.CalculationTypeId);
             Assert.AreEqual(26, assessmentLevelCalculationInput.VariableId);
+            Assert.AreEqual(1, assessmentLevelCalculationInput.FaultTreeModelId);
             Assert.AreEqual(hydraulicBoundaryLocationId, assessmentLevelCalculationInput.HydraulicBoundaryLocationId);
             Assert.IsNotNull(assessmentLevelCalculationInput.Section);
             CollectionAssert.IsEmpty(assessmentLevelCalculationInput.ProfilePoints);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs	(.../DunesBoundaryConditionsCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs	(.../DunesBoundaryConditionsCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -48,6 +48,7 @@
             Assert.AreEqual(HydraRingFailureMechanismType.DunesBoundaryConditions, dunesBoundaryConditionsCalculationInput.FailureMechanismType);
             Assert.AreEqual(2, dunesBoundaryConditionsCalculationInput.CalculationTypeId);
             Assert.AreEqual(26, dunesBoundaryConditionsCalculationInput.VariableId);
+            Assert.AreEqual(8, dunesBoundaryConditionsCalculationInput.FaultTreeModelId);
             Assert.AreEqual(hydraulicBoundaryLocationId, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId);
             Assert.IsNotNull(dunesBoundaryConditionsCalculationInput.Section);
             CollectionAssert.IsEmpty(dunesBoundaryConditionsCalculationInput.ProfilePoints);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs	(.../HydraulicLoadsCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs	(.../HydraulicLoadsCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -90,6 +90,7 @@
             double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm);
             Assert.IsInstanceOf<ReliabilityIndexCalculationInput>(input);
             Assert.AreEqual(9, input.CalculationTypeId);
+            Assert.AreEqual(1017, input.FaultTreeModelId);
             Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
             Assert.IsNotNull(input.Section);
             HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.Variables.ToArray());
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs	(.../WaveHeightCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs	(.../WaveHeightCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -49,6 +49,7 @@
             Assert.AreEqual(HydraRingFailureMechanismType.WaveHeight, waveHeightCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId);
             Assert.AreEqual(28, waveHeightCalculationInput.VariableId);
+            Assert.AreEqual(11, waveHeightCalculationInput.FaultTreeModelId);
             Assert.AreEqual(hydraulicBoundaryLocationId, waveHeightCalculationInput.HydraulicBoundaryLocationId);
             Assert.IsNotNull(waveHeightCalculationInput.Section);
             CollectionAssert.IsEmpty(waveHeightCalculationInput.ProfilePoints);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs
===================================================================
diff -u -rc9adb9ba78be9544433a690fdb9e41560e60bde8 -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision c9adb9ba78be9544433a690fdb9e41560e60bde8)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -90,13 +90,12 @@
                 exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary);
 
             // Assert
-            const int expectedCalculationTypeId = 1;
-            const int expectedVariableId = 1;
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(overtoppingCalculationInput);
-            Assert.AreEqual(expectedCalculationTypeId, overtoppingCalculationInput.CalculationTypeId);
-            Assert.AreEqual(hydraulicBoundaryLocationId, overtoppingCalculationInput.HydraulicBoundaryLocationId);
+            Assert.AreEqual(1, overtoppingCalculationInput.CalculationTypeId);
             Assert.AreEqual(HydraRingFailureMechanismType.DikesOvertopping, overtoppingCalculationInput.FailureMechanismType);
-            Assert.AreEqual(expectedVariableId, overtoppingCalculationInput.VariableId);
+            Assert.AreEqual(1, overtoppingCalculationInput.VariableId);
+            Assert.AreEqual(1017, overtoppingCalculationInput.FaultTreeModelId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, overtoppingCalculationInput.HydraulicBoundaryLocationId);
             HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), overtoppingCalculationInput.Variables.ToArray());
             CollectionAssert.AreEqual(expectedRingProfilePoints, overtoppingCalculationInput.ProfilePoints);
             CollectionAssert.AreEqual(expectedRingForelandPoints, overtoppingCalculationInput.ForelandsPoints);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Piping/PipingCalculationInputTest.cs
===================================================================
diff -u -r5c6007d3ada39d4aa7f1f69b42873652cf68ed48 -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Piping/PipingCalculationInputTest.cs	(.../PipingCalculationInputTest.cs)	(revision 5c6007d3ada39d4aa7f1f69b42873652cf68ed48)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Piping/PipingCalculationInputTest.cs	(.../PipingCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -82,13 +82,12 @@
                 diameter70CoefficientOfVariation, gravity, criticalHeaveGradientMean, criticalHeaveGradientStandardDeviation);
 
             // Assert
-            const int expectedCalculationTypeId = 1;
-            const int expectedVariableId = 58;
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(pipingCalculationInput);
-            Assert.AreEqual(expectedCalculationTypeId, pipingCalculationInput.CalculationTypeId);
-            Assert.AreEqual(hydraulicBoundaryLocationId, pipingCalculationInput.HydraulicBoundaryLocationId);
+            Assert.AreEqual(1, pipingCalculationInput.CalculationTypeId);
             Assert.AreEqual(HydraRingFailureMechanismType.Piping, pipingCalculationInput.FailureMechanismType);
-            Assert.AreEqual(expectedVariableId, pipingCalculationInput.VariableId);
+            Assert.AreEqual(58, pipingCalculationInput.VariableId);
+            Assert.AreEqual(3015, pipingCalculationInput.FaultTreeModelId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, pipingCalculationInput.HydraulicBoundaryLocationId);
             HydraRingDataEqualityHelper.AreEqual(GetDefaultPipingVariables(true).ToArray(), pipingCalculationInput.Variables.ToArray());
             Assert.IsNaN(pipingCalculationInput.Beta);
 
@@ -140,13 +139,12 @@
                 diameter70CoefficientOfVariation, gravity, criticalHeaveGradientMean, criticalHeaveGradientStandardDeviation);
 
             // Assert
-            const int expectedCalculationTypeId = 1;
-            const int expectedVariableId = 58;
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(pipingCalculationInput);
-            Assert.AreEqual(expectedCalculationTypeId, pipingCalculationInput.CalculationTypeId);
-            Assert.AreEqual(hydraulicBoundaryLocationId, pipingCalculationInput.HydraulicBoundaryLocationId);
+            Assert.AreEqual(1, pipingCalculationInput.CalculationTypeId);
             Assert.AreEqual(HydraRingFailureMechanismType.Piping, pipingCalculationInput.FailureMechanismType);
-            Assert.AreEqual(expectedVariableId, pipingCalculationInput.VariableId);
+            Assert.AreEqual(58, pipingCalculationInput.VariableId);
+            Assert.AreEqual(3014, pipingCalculationInput.FaultTreeModelId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, pipingCalculationInput.HydraulicBoundaryLocationId);
             HydraRingDataEqualityHelper.AreEqual(GetDefaultPipingVariables(false).ToArray(), pipingCalculationInput.Variables.ToArray());
             Assert.IsNaN(pipingCalculationInput.Beta);
 
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs	(.../StructuresClosureCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs	(.../StructuresClosureCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -85,11 +85,12 @@
 
             // Assert
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(input);
-            Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
             Assert.AreEqual(1, input.CalculationTypeId);
-            Assert.AreEqual(58, input.VariableId);
             Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType);
+            Assert.AreEqual(58, input.VariableId);
+            Assert.AreEqual(4505, input.FaultTreeModelId);
             Assert.AreEqual(6, input.IterationMethodId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
 
             HydraRingSection section = input.Section;
             Assert.AreEqual(1, section.SectionId);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs	(.../StructuresOvertoppingCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs	(.../StructuresOvertoppingCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -90,14 +90,13 @@
                                                                   stormDurationMean, stormDurationVariation);
 
             // Assert
-            const int expectedCalculationTypeId = 1;
-            const int variableId = 60;
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(input);
-            Assert.AreEqual(expectedCalculationTypeId, input.CalculationTypeId);
-            Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
+            Assert.AreEqual(1, input.CalculationTypeId);
             Assert.AreEqual(HydraRingFailureMechanismType.StructuresOvertopping, input.FailureMechanismType);
-            Assert.AreEqual(variableId, input.VariableId);
+            Assert.AreEqual(60, input.VariableId);
+            Assert.AreEqual(4404, input.FaultTreeModelId);
             Assert.AreEqual(6, input.IterationMethodId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
 
             HydraRingSection section = input.Section;
             Assert.AreEqual(1, section.SectionId);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs	(.../StructuresStabilityPointCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs	(.../StructuresStabilityPointCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -133,11 +133,12 @@
 
             // Assert
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(input);
-            Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
             Assert.AreEqual(1, input.CalculationTypeId);
-            Assert.AreEqual(58, input.VariableId);
             Assert.AreEqual(HydraRingFailureMechanismType.StructuresStructuralFailure, input.FailureMechanismType);
+            Assert.AreEqual(58, input.VariableId);
+            Assert.AreEqual(4607, input.FaultTreeModelId);
             Assert.AreEqual(6, input.IterationMethodId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
 
             HydraRingSection section = input.Section;
             Assert.AreEqual(1, section.SectionId);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs	(.../WaveConditionsCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs	(.../WaveConditionsCalculationInputTest.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
@@ -65,6 +65,7 @@
             Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCalculationInput.FailureMechanismType);
             Assert.AreEqual(8, waveConditionsCalculationInput.CalculationTypeId);
             Assert.AreEqual(114, waveConditionsCalculationInput.VariableId);
+            Assert.AreEqual(6, waveConditionsCalculationInput.FaultTreeModelId);
             Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsCalculationInput.HydraulicBoundaryLocationId);
             Assert.IsNotNull(waveConditionsCalculationInput.Section);
             Assert.AreEqual(sectionId, waveConditionsCalculationInput.Section.SectionId);