Index: build/DatabaseStructure.sql
===================================================================
diff -u -r0a47a2db79679de5ee099ee626c4322d311ade29 -rebe7034bade41cc060e7674a24966af8d3c603b2
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 0a47a2db79679de5ee099ee626c4322d311ade29)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision ebe7034bade41cc060e7674a24966af8d3c603b2)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 14.1 		*/
-/*  Created On : 12-nov-2021 10:26:25 				*/
+/*  Created On : 18-nov-2021 14:44:51 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -359,7 +359,6 @@
 	'NormativeNormType' TINYINT (1) NOT NULL,	-- EnumType: 1 = LowerLimit, 2 = Signaling
 	'Composition' TINYINT (1) NOT NULL,	-- Enum: 1 = Dike, 2 = Dune, 3 = DikeAndDune
 	'ReferenceLinePointXml' TEXT NULL,
-	'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_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade,
@@ -1259,7 +1258,7 @@
 	'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NOT NULL,
 	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL,
 	CONSTRAINT 'PK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId','HydraulicLocationCalculationEntityId'),
-	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE No Action ON UPDATE No Action,
+	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
 	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE No Action ON UPDATE No Action
 )
 ;
@@ -2335,7 +2334,7 @@
 ;
 CREATE TRIGGER [TR_AfterDeleteFailureMechanismEntity_RemoveFailureMechanismSectionEntityId]
 	AFTER DELETE
-	ON FailureMechanismEntity
+	ON FailureMechanismFailureMechanismSectionEntity
 	FOR EACH ROW
 BEGIN
 	DELETE 
@@ -2582,9 +2581,9 @@
 	FOR EACH ROW
 BEGIN
 	DELETE 
-	FROM HydraulicLocationCalculationEntity
-	WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL 
-	AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId;
+	FROM HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity
+	WHERE OLD.HydraulicLocationCalculationCollectionEntityId IS NOT NULL 
+	AND HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntityId;
 END; 
 ;
 
@@ -2605,11 +2604,11 @@
 ;
 CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationForTargetProbabilityCollectionEntity_RemoveHydraulicLocationCalculationEntity]
 	AFTER DELETE
-	ON HydraulicLocationCalculationForTargetProbabilityCollectionEntity
+	ON HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity
 	FOR EACH ROW
 BEGIN
 	DELETE 
-	FROM HydraulicLocationCalculationEntity
+	FROM HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity
 	WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL 
 	AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId;
 END; 
@@ -2796,9 +2795,13 @@
 CREATE INDEX 'IXFK_SpecificFailurePathFailureMechanismSectionEntity_FailureMechanismSectionEntity'
  ON 'SpecificFailurePathFailureMechanismSectionEntity' ('FailureMechanismSectionEntityId' ASC)
 ;
+
+CREATE INDEX 'IXFK_SpecificFailurePathFailureMechanismSectionEntity_SpecificFailurePathEntity'
+ ON 'SpecificFailurePathFailureMechanismSectionEntity' ('SpecificFailurePathEntityId' ASC)
+;
 CREATE TRIGGER [TR_AfterDeleteSpecificFailurePathEntity_RemoveFailureMechanismSectionEntityId]
 	AFTER DELETE
-	ON SpecificFailurePathEntity
+	ON SpecificFailurePathFailureMechanismSectionEntity
 	FOR EACH ROW
 BEGIN
 	DELETE