Index: build/DatabaseStructure.sql
===================================================================
diff -u -r84000889b79b77b771fa4b5ba7d8fd2d72d3b782 -r25b3b72a0a89bd921333361d53b7d6feb4578347
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 84000889b79b77b771fa4b5ba7d8fd2d72d3b782)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 25b3b72a0a89bd921333361d53b7d6feb4578347)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 14.1 		*/
-/*  Created On : 22-jul-2021 08:59:29 				*/
+/*  Created On : 14-sep-2021 12:33:05 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -30,10 +30,10 @@
 DROP TABLE IF EXISTS 'HydraulicLocationEntity'
 ;
 
-DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity'
 ;
 
-DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity'
+DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
 ;
 
 DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
@@ -42,10 +42,10 @@
 DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
 ;
 
-DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
+DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
 ;
 
-DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
+DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
 ;
 
 DROP TABLE IF EXISTS 'PipingStochasticSoilProfileEntity'
@@ -171,9 +171,18 @@
 DROP TABLE IF EXISTS 'HydraulicBoundaryDatabaseEntity'
 ;
 
+DROP TABLE IF EXISTS 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
+;
+
+DROP TABLE IF EXISTS 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity'
+;
+
 DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionEntity'
 ;
 
+DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity'
+;
+
 DROP TABLE IF EXISTS 'HydraulicLocationCalculationEntity'
 ;
 
@@ -331,14 +340,8 @@
 (
 	'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'ProjectEntityId' INTEGER NOT NULL,
-	'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL,	-- Represents the design water level factorized signaling norm
-	'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL,	-- Represents the design water level signaling norm
-	'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL,	-- Represents the design water level lower limit norm
-	'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL,	-- Represents the design water level factorized lower limit norm
-	'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL,	-- Represents the wave height factorized signaling norm
-	'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL,	-- Represents the wave height signaling norm
-	'HydraulicLocationCalculationCollectionEntity7Id' INTEGER NOT NULL,	-- Represents the wave height lower limit norm
-	'HydraulicLocationCalculationCollectionEntity8Id' INTEGER NOT NULL,	-- Represents the wave height factorized lower limit norm
+	'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL,	-- Represents the design water level signaling norm
+	'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL,	-- Represents the design water level lower limit norm
 	'Id' TEXT NULL,
 	'Name' VARCHAR (260) NULL,
 	'Comments' TEXT NULL,
@@ -350,21 +353,9 @@
 	'Order' INT (4) NOT NULL,
 	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity1' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
 	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity2' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity7Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity8Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
 	CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade,
 	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity1Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity3Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity3Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity4Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity4Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity5Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity5Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity6Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity6Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity7Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity7Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity8Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity8Id')
+	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id')
 )
 ;
 
@@ -429,16 +420,6 @@
 )
 ;
 
-CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
-(
-	'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'FailureMechanismEntityId' INTEGER NOT NULL,
-	'N' REAL NOT NULL,
-	'DikeProfileCollectionSourcePath' TEXT NULL,
-	CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
 CREATE TABLE 'SemiProbabilisticPipingCalculationEntity'
 (
 	'SemiProbabilisticPipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -466,6 +447,16 @@
 )
 ;
 
+CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
+(
+	'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'FailureMechanismEntityId' INTEGER NOT NULL,
+	'N' REAL NOT NULL,
+	'DikeProfileCollectionSourcePath' TEXT NULL,
+	CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
 CREATE TABLE 'GrassCoverErosionInwardsCalculationEntity'
 (
 	'GrassCoverErosionInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -502,30 +493,21 @@
 (
 	'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'FailureMechanismEntityId' INTEGER NOT NULL,
-	'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL,	-- Represents the design water level failure mechanism specific factorized signaling norm
-	'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL,	-- Represents the design water level failure mechanism specific signaling norm
-	'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL,	-- Represents the design water level failure mechanism specific lower limit norm
-	'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL,	-- Represents the wave height failure mechanism specific factorized signaling norm
-	'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL,	-- Represents the wave height failure mechanism specific signaling norm
-	'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL,	-- Represents the wave height failure mechanism specific lower limit norm
 	'N' REAL NOT NULL,
 	'ForeshoreProfileCollectionSourcePath' TEXT NULL,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity1' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity2' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity3' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity4' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity5' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity6' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade,
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity1Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity3Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity3Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity4Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity4Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity5Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity5Id'),
-	CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity6Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity6Id')
+	CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
+CREATE TABLE 'PipingSoilProfileEntity'
+(
+	'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'Bottom' REAL NULL,
+	'Name' TEXT NOT NULL,
+	'SourceType' TINYINT (1) NOT NULL	-- Enum: 1 = SoilProfile1D,  2 = SoilProfile2D
+)
+;
+
 CREATE TABLE 'PipingSoilLayerEntity'
 (
 	'PipingSoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -546,15 +528,6 @@
 )
 ;
 
-CREATE TABLE 'PipingSoilProfileEntity'
-(
-	'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'Bottom' REAL NULL,
-	'Name' TEXT NOT NULL,
-	'SourceType' TINYINT (1) NOT NULL	-- Enum: 1 = SoilProfile1D,  2 = SoilProfile2D
-)
-;
-
 CREATE TABLE 'PipingStochasticSoilProfileEntity'
 (
 	'PipingStochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -1231,19 +1204,48 @@
 )
 ;
 
+CREATE TABLE 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
+(
+	'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'AssessmentSectionEntityId' INTEGER NOT NULL,
+	'HydraulicBoundaryLocationCalculationType' TINYINT (1) NOT NULL,	-- Enum: 1 = Waterlevel 2 = Waveheight
+	'TargetProbability' REAL NOT NULL,
+	CONSTRAINT 'FK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
+CREATE TABLE 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity'
+(
+	'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' INTEGER NOT NULL,
+	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL,
+	CONSTRAINT 'PK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId','HydraulicLocationCalculationEntityId'),
+	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' FOREIGN KEY ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId') REFERENCES 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity' ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId') ON DELETE No Action ON UPDATE No Action,
+	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE No Action ON UPDATE No Action
+)
+;
+
 CREATE TABLE 'HydraulicLocationCalculationCollectionEntity'
 (
 	'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT
 )
 ;
 
+CREATE TABLE 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity'
+(
+	'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL,
+	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL,
+	CONSTRAINT 'PK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationCollectionEntityId','HydraulicLocationCalculationEntityId'),
+	CONSTRAINT 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntityId' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntityId') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
+	CONSTRAINT 'HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
 CREATE TABLE 'HydraulicLocationCalculationEntity'
 (
 	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'HydraulicLocationEntityId' INTEGER NOT NULL,
 	'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL,
 	'ShouldIllustrationPointsBeCalculated' TINYINT (1) NOT NULL,	-- True or false
-	CONSTRAINT 'FK_HydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntityId') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
 	CONSTRAINT 'FK_HydraulicLocationCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
@@ -2106,30 +2108,6 @@
  ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity2Id' ASC)
 ;
 
-CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3'
- ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity3Id' ASC)
-;
-
-CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4'
- ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity4Id' ASC)
-;
-
-CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5'
- ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity5Id' ASC)
-;
-
-CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6'
- ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity6Id' ASC)
-;
-
-CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7'
- ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity7Id' ASC)
-;
-
-CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8'
- ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity8Id' ASC)
-;
-
 CREATE INDEX 'IXFK_AssessmentSectionEntity_ProjectEntity'
  ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC)
 ;
@@ -2141,13 +2119,7 @@
 	DELETE 
 	FROM HydraulicLocationCalculationCollectionEntity
 	WHERE HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity1Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity2Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity3Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity4Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity5Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity6Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity7Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity8Id;
+	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity2Id;
 END; 
 ;
 
@@ -2175,10 +2147,6 @@
  ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_SemiProbabilisticPipingCalculationEntity_PipingStochasticSoilProfileEntity'
  ON 'SemiProbabilisticPipingCalculationEntity' ('PipingStochasticSoilProfileEntityId' ASC)
 ;
@@ -2195,6 +2163,10 @@
  ON 'SemiProbabilisticPipingCalculationEntity' ('CalculationGroupEntityId' ASC)
 ;
 
+CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
 CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity'
  ON 'GrassCoverErosionInwardsCalculationEntity' ('CalculationGroupEntityId' ASC)
 ;
@@ -2211,47 +2183,6 @@
  ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity1'
- ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity1Id' ASC)
-;
-
-CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity2'
- ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity2Id' ASC)
-;
-
-CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity3'
- ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity3Id' ASC)
-;
-
-CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity4'
- ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity4Id' ASC)
-;
-
-CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity5'
- ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity5Id' ASC)
-;
-
-CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity6'
- ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity6Id' ASC)
-;
-CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsFailureMechanismMetaEntity_RemoveHydraulicLocationCalculationCollectionEntities]
-	AFTER DELETE
-	ON GrassCoverErosionOutwardsFailureMechanismMetaEntity
-	FOR EACH ROW
-BEGIN
-	DELETE 
-	FROM HydraulicLocationCalculationCollectionEntity
-	WHERE HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity1Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity2Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity3Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity4Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity5Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity6Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity7Id
-	OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity8Id;
-END; 
-;
-
 CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_SoilProfileEntity'
  ON 'PipingStochasticSoilProfileEntity' ('PipingSoilProfileEntityId' ASC)
 ;
@@ -2605,10 +2536,48 @@
  ON 'HydraulicBoundaryDatabaseEntity' ('AssessmentSectionEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_HydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity'
- ON 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationCollectionEntityId' ASC)
+CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity'
+ ON 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity' ('AssessmentSectionEntityId' ASC)
 ;
 
+CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
+ ON 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity'
+ ON 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC)
+;
+CREATE TRIGGER [TR_AfterDeleteHydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_RemoveHydraulicLocationCalculationEntity]
+	AFTER DELETE
+	ON HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM HydraulicLocationCalculationEntity
+	WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL 
+	AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId;
+END; 
+;
+
+CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity'
+ ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationCollectionEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity'
+ ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC)
+;
+CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationCollectionEntity_RemoveHydraulicLocationCalculationEntity]
+	AFTER DELETE
+	ON HydraulicLocationCalculationCollectionEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM HydraulicLocationCalculationEntity
+	WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL 
+	AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId;
+END; 
+;
+
 CREATE INDEX 'IXFK_HydraulicLocationCalculationEntity_HydraulicLocationEntity'
  ON 'HydraulicLocationCalculationEntity' ('HydraulicLocationEntityId' ASC)
 ;
