Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r59912f4503f8c3c1584fdd28fa42faf349e7b654 -r958ec3ca6d7aac0a6b47f25208121e06281f15e6
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision 59912f4503f8c3c1584fdd28fa42faf349e7b654)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision 958ec3ca6d7aac0a6b47f25208121e06281f15e6)
@@ -264,16 +264,7 @@
 
         private static IEnumerable<DuneLocationCalculation> GetDuneLocationCalculations(AssessmentSection assessmentSection)
         {
-            DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion;
-
-            var calculations = new List<DuneLocationCalculation>();
-            calculations.AddRange(duneErosionFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm);
-            calculations.AddRange(duneErosionFailureMechanism.CalculationsForMechanismSpecificSignalingNorm);
-            calculations.AddRange(duneErosionFailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm);
-            calculations.AddRange(duneErosionFailureMechanism.CalculationsForLowerLimitNorm);
-            calculations.AddRange(duneErosionFailureMechanism.CalculationsForFactorizedLowerLimitNorm);
-
-            return calculations;
+            return assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities.SelectMany(dlc => dlc.DuneLocationCalculations);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -rba7cc58d613025234b43ccc9f88a681cb20f8483 -r958ec3ca6d7aac0a6b47f25208121e06281f15e6
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision ba7cc58d613025234b43ccc9f88a681cb20f8483)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 958ec3ca6d7aac0a6b47f25208121e06281f15e6)
@@ -269,6 +269,16 @@
             };
 
             DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion;
+
+            var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability();
+            var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability();
+
+            duneErosionFailureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.AddRange(new[]
+            {
+                duneLocationCalculationsForTargetProbability1,
+                duneLocationCalculationsForTargetProbability2
+            });
+
             duneErosionFailureMechanism.SetDuneLocations(new[]
             {
                 duneLocation1,
@@ -307,17 +317,11 @@
             hydraulicBoundaryLocationCalculation7.Output = new TestHydraulicBoundaryLocationCalculationOutput();
             hydraulicBoundaryLocationCalculation8.Output = new TestHydraulicBoundaryLocationCalculationOutput();
 
-            DuneLocationCalculation duneLocationCalculation1 = duneErosionFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
-            DuneLocationCalculation duneLocationCalculation2 = duneErosionFailureMechanism.CalculationsForMechanismSpecificSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
-            DuneLocationCalculation duneLocationCalculation3 = duneErosionFailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
-            DuneLocationCalculation duneLocationCalculation4 = duneErosionFailureMechanism.CalculationsForLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
-            DuneLocationCalculation duneLocationCalculation5 = duneErosionFailureMechanism.CalculationsForFactorizedLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
+            DuneLocationCalculation duneLocationCalculation1 = duneLocationCalculationsForTargetProbability1.DuneLocationCalculations.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
+            DuneLocationCalculation duneLocationCalculation2 = duneLocationCalculationsForTargetProbability2.DuneLocationCalculations.First(c => ReferenceEquals(c.DuneLocation, duneLocation1));
 
             duneLocationCalculation1.Output = new TestDuneLocationCalculationOutput();
             duneLocationCalculation2.Output = new TestDuneLocationCalculationOutput();
-            duneLocationCalculation3.Output = new TestDuneLocationCalculationOutput();
-            duneLocationCalculation4.Output = new TestDuneLocationCalculationOutput();
-            duneLocationCalculation5.Output = new TestDuneLocationCalculationOutput();
 
             var expectedAffectedItems = new IObservable[]
             {
@@ -330,10 +334,7 @@
                 hydraulicBoundaryLocationCalculation7,
                 hydraulicBoundaryLocationCalculation8,
                 duneLocationCalculation1,
-                duneLocationCalculation2,
-                duneLocationCalculation3,
-                duneLocationCalculation4,
-                duneLocationCalculation5
+                duneLocationCalculation2
             };
 
             // Call
@@ -353,9 +354,6 @@
 
             Assert.IsNull(duneLocationCalculation1.Output);
             Assert.IsNull(duneLocationCalculation2.Output);
-            Assert.IsNull(duneLocationCalculation3.Output);
-            Assert.IsNull(duneLocationCalculation4.Output);
-            Assert.IsNull(duneLocationCalculation5.Output);
         }
 
         [Test]
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r3e0814af5f0045f57ab89723d8d55db530c8f6f5 -r958ec3ca6d7aac0a6b47f25208121e06281f15e6
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 3e0814af5f0045f57ab89723d8d55db530c8f6f5)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 958ec3ca6d7aac0a6b47f25208121e06281f15e6)
@@ -922,11 +922,17 @@
 
         private static void SetFullyConfiguredFailureMechanism(DuneErosionFailureMechanism failureMechanism)
         {
+            var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability();
+
+            failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.Add(calculationsForTargetProbability);
+
             failureMechanism.SetDuneLocations(new[]
             {
                 new TestDuneLocation()
             });
 
+            calculationsForTargetProbability.DuneLocationCalculations.First().Output = new TestDuneLocationCalculationOutput();
+
             failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationCalculationOutput();
             failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationCalculationOutput();
             failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput();