Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r23766b602d9b509a2ffc030f284e8d5e82325a3e -r508d720230c5f63bce7f95bddc3b7a04808d267d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 23766b602d9b509a2ffc030f284e8d5e82325a3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 508d720230c5f63bce7f95bddc3b7a04808d267d)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 28-jul-2016 16:23:20 				*/
+/*  Created On : 01-aug-2016 14:44:48 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -24,9 +24,6 @@
 DROP TABLE IF EXISTS 'FailureMechanismEntity'
 ;
 
-DROP TABLE IF EXISTS 'FailureMechanismSectionPointEntity'
-;
-
 DROP TABLE IF EXISTS 'CalculationGroupEntity'
 ;
 
@@ -42,15 +39,12 @@
 DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
 ;
 
-DROP TABLE IF EXISTS 'ReferenceLinePointEntity'
+DROP TABLE IF EXISTS 'SoilProfileEntity'
 ;
 
 DROP TABLE IF EXISTS 'SoilLayerEntity'
 ;
 
-DROP TABLE IF EXISTS 'SoilProfileEntity'
-;
-
 DROP TABLE IF EXISTS 'StochasticSoilProfileEntity'
 ;
 
@@ -60,9 +54,6 @@
 DROP TABLE IF EXISTS 'SurfaceLineEntity'
 ;
 
-DROP TABLE IF EXISTS 'SurfaceLinePointEntity'
-;
-
 DROP TABLE IF EXISTS 'PipingCalculationOutputEntity'
 ;
 
@@ -173,6 +164,7 @@
 	'HydraulicDatabaseVersion' TEXT,
 	'HydraulicDatabaseLocation' TEXT,
 	'Composition' SMALLINT NOT NULL, -- Enum: Dike = 0, Dune = 1, DikeAndDune = 2
+	'ReferenceLinePointData' BLOB,
 	CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
@@ -182,6 +174,7 @@
 	'FailureMechanismSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'FailureMechanismEntityId' INTEGER NOT NULL,
 	'Name' VARCHAR (260) NOT NULL,
+	'FailureMechanismSectionPointData' BLOB NOT NULL,
 	CONSTRAINT 'FK_FailureMechanismSectionEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
@@ -200,17 +193,6 @@
 )
 ;
 
-CREATE TABLE 'FailureMechanismSectionPointEntity'
-(
-	'FailureMechanismSectionPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'FailureMechanismSectionEntityId' INTEGER NOT NULL,
-	'X' REAL,
-	'Y' REAL,
-	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_FailureMechanismSectionPointEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
 CREATE TABLE 'CalculationGroupEntity'
 (
 	'CalculationGroupEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -306,14 +288,11 @@
 )
 ;
 
-CREATE TABLE 'ReferenceLinePointEntity'
+CREATE TABLE 'SoilProfileEntity'
 (
-	'ReferenceLinePointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'AssessmentSectionEntityId' INTEGER NOT NULL,
-	'X' REAL,
-	'Y' REAL,
-	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_ReferenceLinePointEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+	'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'Bottom' REAL,
+	'Name' TEXT
 )
 ;
 
@@ -336,14 +315,6 @@
 )
 ;
 
-CREATE TABLE 'SoilProfileEntity'
-(
-	'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'Bottom' REAL,
-	'Name' TEXT
-)
-;
-
 CREATE TABLE 'StochasticSoilProfileEntity'
 (
 	'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -361,7 +332,7 @@
 	'FailureMechanismEntityId' INTEGER NOT NULL,
 	'Name' TEXT,
 	'SegmentName' TEXT,
-	'SegmentPoints' BLOB NOT NULL,
+	'StochasticSoilModelSegmentPointData' BLOB NOT NULL,
 	CONSTRAINT 'FK_StochasticSoilModelEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
@@ -373,22 +344,11 @@
 	'Name' VARCHAR (260),
 	'ReferenceLineIntersectionX' REAL,
 	'ReferenceLineIntersectionY' REAL,
+	'PointsData' BLOB NOT NULL,
 	CONSTRAINT 'FK_SurfaceLineEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE No Action ON UPDATE No Action
 )
 ;
 
-CREATE TABLE 'SurfaceLinePointEntity'
-(
-	'SurfaceLinePointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'SurfaceLineEntityId' INTEGER NOT NULL,
-	'X' REAL,
-	'Y' REAL,
-	'Order' INT (4) NOT NULL,
-	'Z' REAL,
-	CONSTRAINT 'FK_SurfaceLinePointEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE No Action ON UPDATE No Action
-)
-;
-
 CREATE TABLE 'PipingCalculationOutputEntity'
 (
 	'PipingCalculationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -404,9 +364,12 @@
 CREATE TABLE 'CharacteristicPointEntity'
 (
 	'CharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'CharacteristicPointType' SMALLINT NOT NULL, -- Enum: 1 = DikeToeAtRiver 2 = DikeToeAtPolder 3 = DitchDikeSide 4 = BottomDitchDikeSide 5 = BottomDitchPolderSide 6 = DitchPolderSide
-	'SurfaceLinePointEntityId' INTEGER NOT NULL,
-	CONSTRAINT 'FK_CharacteristicPointEntity_SurfaceLinePointEntity' FOREIGN KEY ('SurfaceLinePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action
+	'SurfaceLineEntityId' INTEGER NOT NULL,
+	'Type' SMALLINT NOT NULL, -- Enum: 1 = DikeToeAtRiver 2 = DikeToeAtPolder 3 = DitchDikeSide 4 = BottomDitchDikeSide 5 = BottomDitchPolderSide 6 = DitchPolderSide
+	'X' REAL,
+	'Y' REAL,
+	'Z' REAL,
+	CONSTRAINT 'FK_SurfaceLinePointEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE No Action ON UPDATE No Action
 )
 ;
 
@@ -684,10 +647,6 @@
  ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_FailureMechanismSectionPointEntity_FailureMechanismSectionEntity'
- ON 'FailureMechanismSectionPointEntity' ('FailureMechanismSectionEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_CalculationGroupEntity_CalculationGroupEntity'
  ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC)
 ;
@@ -740,10 +699,6 @@
  ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_ReferenceLinePointEntity_AssessmentSectionEntity'
- ON 'ReferenceLinePointEntity' ('AssessmentSectionEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_StochasticSoilProfileEntity_SoilProfileEntity'
  ON 'StochasticSoilProfileEntity' ('SoilProfileEntityId' ASC)
 ;
@@ -761,13 +716,9 @@
 ;
 
 CREATE INDEX 'IXFK_SurfaceLinePointEntity_SurfaceLineEntity'
- ON 'SurfaceLinePointEntity' ('SurfaceLineEntityId' ASC)
+ ON 'CharacteristicPointEntity' ('SurfaceLineEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_CharacteristicPointEntity_SurfaceLinePointEntity'
- ON 'CharacteristicPointEntity' ('SurfaceLinePointEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_PipingSectionResultEntity_FailureMechanismSectionEntity'
  ON 'PipingSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
 ;