Index: build/DatabaseStructure.sql
===================================================================
diff -u -r9c42e1da04df136bcc1c819bd5c32b9a23528304 -rc4b7db13195eb0c844c04291222669c4683f6b8a
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 9c42e1da04df136bcc1c819bd5c32b9a23528304)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision c4b7db13195eb0c844c04291222669c4683f6b8a)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
-/*  Generated by Enterprise Architect Version 14.1 		*/
-/*  Created On : 05-apr-2022 09:30:38 				*/
+/*  Generated by Enterprise Architect Version 15.2 		*/
+/*  Created On : 11-apr-2023 10:27:28 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -171,6 +171,9 @@
 DROP TABLE IF EXISTS 'HydraulicBoundaryDatabaseEntity'
 ;
 
+DROP TABLE IF EXISTS 'HydraulicBoundaryDataEntity'
+;
+
 DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionEntity'
 ;
 
@@ -389,13 +392,13 @@
 CREATE TABLE 'HydraulicLocationEntity'
 (
 	'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'AssessmentSectionEntityId' INTEGER NOT NULL,
+	'HydraulicBoundaryDatabaseEntityId' INTEGER NOT NULL,
 	'LocationId' INTEGER NOT NULL,
 	'Name' VARCHAR (260) NOT NULL,
 	'LocationX' REAL NULL,
 	'LocationY' REAL NULL,
 	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_HydraulicLocationEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+	CONSTRAINT 'FK_HydraulicLocationEntity_HydraulicBoundaryDatabaseEntity' FOREIGN KEY ('HydraulicBoundaryDatabaseEntityId') REFERENCES 'HydraulicBoundaryDatabaseEntity' ('HydraulicBoundaryDatabaseEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
@@ -826,17 +829,16 @@
 CREATE TABLE 'DuneLocationEntity'
 (
 	'DuneLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'HydraulicLocationEntityId' INTEGER NOT NULL,
 	'FailureMechanismEntityId' INTEGER NOT NULL,
-	'LocationId' INTEGER NOT NULL,
 	'Name' VARCHAR (260) NOT NULL,
-	'LocationX' REAL NULL,
-	'LocationY' REAL NULL,
 	'CoastalAreaId' INT (4) NOT NULL,
 	'Offset' REAL NULL,
 	'Orientation' REAL NULL,
 	'D50' REAL NULL,
 	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_DuneLocationEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+	CONSTRAINT 'FK_DuneLocationEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade,
+	CONSTRAINT 'FK_DuneLocationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
@@ -1139,21 +1141,30 @@
 
 CREATE TABLE 'HydraulicBoundaryDatabaseEntity'
 (
-	'HydraulicBoundaryDatabaseEntity' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'AssessmentSectionEntityId' INTEGER NOT NULL,
+	'HydraulicBoundaryDatabaseEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'HydraulicBoundaryDataEntityId' INTEGER NOT NULL,
 	'Version' TEXT NOT NULL,
 	'FilePath' TEXT NOT NULL,
-	'HydraulicLocationConfigurationSettingsFilePath' TEXT NOT NULL,
-	'HydraulicLocationConfigurationSettingsScenarioName' TEXT NOT NULL,
-	'HydraulicLocationConfigurationSettingsYear' INT (4) NOT NULL,
-	'HydraulicLocationConfigurationSettingsScope' TEXT NOT NULL,
-	'HydraulicLocationConfigurationSettingsUsePreprocessorClosure' TINYINT (1) NOT NULL,
-	'HydraulicLocationConfigurationSettingsSeaLevel' TEXT NULL,
-	'HydraulicLocationConfigurationSettingsRiverDischarge' TEXT NULL,
-	'HydraulicLocationConfigurationSettingsLakeLevel' TEXT NULL,
-	'HydraulicLocationConfigurationSettingsWindDirection' TEXT NULL,
-	'HydraulicLocationConfigurationSettingsWindSpeed' TEXT NULL,
-	'HydraulicLocationConfigurationSettingsComment' TEXT NULL,
+	'UsePreprocessorClosure' TINYINT (1) NOT NULL,	-- True or false
+	'Order' INT (4) NOT NULL,
+	CONSTRAINT 'FK_HydraulicBoundaryDatabaseEntity_HydraulicBoundaryDataEntity' FOREIGN KEY ('HydraulicBoundaryDataEntityId') REFERENCES 'HydraulicBoundaryDataEntity' ('HydraulicBoundaryDataEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
+CREATE TABLE 'HydraulicBoundaryDataEntity'
+(
+	'HydraulicBoundaryDataEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'AssessmentSectionEntityId' INTEGER NOT NULL,
+	'HydraulicLocationConfigurationDatabaseFilePath' TEXT NOT NULL,
+	'HydraulicLocationConfigurationDatabaseScenarioName' TEXT NOT NULL,
+	'HydraulicLocationConfigurationDatabaseYear' INT (4) NOT NULL,
+	'HydraulicLocationConfigurationDatabaseScope' TEXT NOT NULL,
+	'HydraulicLocationConfigurationDatabaseSeaLevel' TEXT NULL,
+	'HydraulicLocationConfigurationDatabaseRiverDischarge' TEXT NULL,
+	'HydraulicLocationConfigurationDatabaseLakeLevel' TEXT NULL,
+	'HydraulicLocationConfigurationDatabaseWindDirection' TEXT NULL,
+	'HydraulicLocationConfigurationDatabaseWindSpeed' TEXT NULL,
+	'HydraulicLocationConfigurationDatabaseComment' TEXT NULL,
 	CONSTRAINT 'FK_HydraulicBoundaryDatabaseEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
@@ -1207,7 +1218,7 @@
 CREATE TABLE 'HydraulicLocationOutputEntity'
 (
 	'HydraulicLocationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'HydraulicLocationCalculationEntityId' INTEGER NULL,
+	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL,
 	'GeneralResultSubMechanismIllustrationPointEntityId' INTEGER NULL,
 	'Result' REAL NULL,
 	'TargetProbability' REAL NULL,
@@ -2005,8 +2016,8 @@
  ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity'
- ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
+CREATE INDEX 'IXFK_HydraulicLocationEntity_HydraulicBoundaryDatabaseEntity'
+ ON 'HydraulicLocationEntity' ('HydraulicBoundaryDatabaseEntityId' ASC)
 ;
 
 CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
@@ -2160,6 +2171,10 @@
  ON 'DuneLocationEntity' ('FailureMechanismEntityId' ASC)
 ;
 
+CREATE INDEX 'IXFK_DuneLocationEntity_HydraulicLocationEntity'
+ ON 'DuneLocationEntity' ('HydraulicLocationEntityId' ASC)
+;
+
 CREATE INDEX 'IXFK_FailureMechanismFailureMechanismSectionEntity_FailureMechanismEntity'
  ON 'FailureMechanismFailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC)
 ;
@@ -2383,8 +2398,12 @@
 END; 
 ;
 
+CREATE INDEX 'IXFK_HydraulicBoundaryDatabaseEntity_HydraulicBoundaryDataEntity'
+ ON 'HydraulicBoundaryDatabaseEntity' ('HydraulicBoundaryDataEntityId' ASC)
+;
+
 CREATE INDEX 'IXFK_HydraulicBoundaryDatabaseEntity_AssessmentSectionEntity'
- ON 'HydraulicBoundaryDatabaseEntity' ('AssessmentSectionEntityId' ASC)
+ ON 'HydraulicBoundaryDataEntity' ('AssessmentSectionEntityId' ASC)
 ;
 
 CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity'