Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r6059a4af5c28390c79efa4e808e28cc93eeddac1 -rb2e7713ec43e71c2ad818b0f5d6405b6eab49e63
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision b2e7713ec43e71c2ad818b0f5d6405b6eab49e63)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 31-mei-2016 14:13:08 				*/
+/*  Created On : 02-jun-2016 11:44:10 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -132,7 +132,7 @@
 	'FailureMechanismSectionEntityId' INTEGER NOT NULL,
 	'X' NUMERIC NOT NULL,
 	'Y' NUMERIC NOT NULL,
-	'Order' INTEGER NOT NULL,
+	'Order' INT (4) NOT NULL,
 	CONSTRAINT 'FK_FailureMechanismSectionPointEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionPointEntity.cs
===================================================================
diff -u -rb809769cd89b011d6746bf0b9b99eff1abd49f60 -rb2e7713ec43e71c2ad818b0f5d6405b6eab49e63
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionPointEntity.cs	(.../FailureMechanismSectionPointEntity.cs)	(revision b809769cd89b011d6746bf0b9b99eff1abd49f60)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionPointEntity.cs	(.../FailureMechanismSectionPointEntity.cs)	(revision b2e7713ec43e71c2ad818b0f5d6405b6eab49e63)
@@ -39,7 +39,7 @@
         public long FailureMechanismSectionEntityId { get; set; }
         public decimal X { get; set; }
         public decimal Y { get; set; }
-        public long Order { get; set; }
+        public int Order { get; set; }
     
         public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; }
     }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -r6059a4af5c28390c79efa4e808e28cc93eeddac1 -rb2e7713ec43e71c2ad818b0f5d6405b6eab49e63
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs	(.../RingtoetsEntities.Designer.cs)	(revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs	(.../RingtoetsEntities.Designer.cs)	(revision b2e7713ec43e71c2ad818b0f5d6405b6eab49e63)
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. 
+// T4 code generation is enabled for model 'D:\Branch_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r6059a4af5c28390c79efa4e808e28cc93eeddac1 -rb2e7713ec43e71c2ad818b0f5d6405b6eab49e63
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision b2e7713ec43e71c2ad818b0f5d6405b6eab49e63)
@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="RingtoetsEntitiesModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rtd" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="RingtoetsEntitiesModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\Branch_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rtd" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="AssessmentSectionEntity">
           <Key>
             <PropertyRef Name="AssessmentSectionEntityId" />
@@ -63,7 +63,7 @@
           <Property Name="FailureMechanismSectionEntityId" Type="integer" Nullable="false" />
           <Property Name="X" Type="decimal" Precision="53" Scale="0" Nullable="false" />
           <Property Name="Y" Type="decimal" Precision="53" Scale="0" Nullable="false" />
-          <Property Name="Order" Type="integer" Nullable="false" />
+          <Property Name="Order" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="HydraulicLocationEntity">
           <Key>
@@ -715,7 +715,7 @@
           <Property Name="FailureMechanismSectionEntityId" Type="Int64" Nullable="false" />
           <Property Name="X" Type="Decimal" Nullable="false" Precision="53" Scale="0" />
           <Property Name="Y" Type="Decimal" Nullable="false" Precision="53" Scale="0" />
-          <Property Name="Order" Type="Int64" Nullable="false" />
+          <Property Name="Order" Type="Int32" Nullable="false" />
           <NavigationProperty Name="FailureMechanismSectionEntity" Relationship="RingtoetsEntitiesModel.FK_FailureMechanismSectionPointEntity_0_0" FromRole="FailureMechanismSectionPointEntity" ToRole="FailureMechanismSectionEntity" />
         </EntityType>
         <EntityType Name="HydraulicLocationEntity">
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r6059a4af5c28390c79efa4e808e28cc93eeddac1 -rb2e7713ec43e71c2ad818b0f5d6405b6eab49e63
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision 6059a4af5c28390c79efa4e808e28cc93eeddac1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision b2e7713ec43e71c2ad818b0f5d6405b6eab49e63)
@@ -7,21 +7,21 @@
       <Diagram DiagramId="143406871b624a3080def7c3c31a548f" Name="Diagram1">
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.AssessmentSectionEntity" Width="1.5" PointX="3" PointY="11" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.CalculationGroupEntity" Width="1.5" PointX="3" PointY="7.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="12" PointY="16" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="12" PointY="8.875" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismEntity" Width="1.5" PointX="5.25" PointY="11.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="19" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionPointEntity" Width="1.5" PointX="9.75" PointY="18.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="19.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" Width="1.5" PointX="15" PointY="12.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="11.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionPointEntity" Width="1.5" PointX="9.75" PointY="11.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="22.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" Width="1.5" PointX="12" PointY="13.625" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.ProjectEntity" Width="1.5" PointX="0.75" PointY="12" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ReferenceLinePointEntity" Width="1.5" PointX="5.25" PointY="22.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="5.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="8.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelSegmentPointEntity" Width="1.5" PointX="9.75" PointY="11.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="8.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="15.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLinePointEntity" Width="1.5" PointX="9.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ReferenceLinePointEntity" Width="1.5" PointX="5.25" PointY="19.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="20.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="17.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="14.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelSegmentPointEntity" Width="1.5" PointX="9.75" PointY="18" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="14.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="8.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLinePointEntity" Width="1.5" PointX="9.75" PointY="8.5" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.VersionEntity" Width="1.5" PointX="0.75" PointY="0.75" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_AssessmentSectionEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_FailureMechanismEntity_1_0" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilModelUpdateExtensionsTest.cs
===================================================================
diff -u -r4478bdf539df278f9e2aac0f9fe683c34ac55335 -rb2e7713ec43e71c2ad818b0f5d6405b6eab49e63
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilModelUpdateExtensionsTest.cs	(.../StochasticSoilModelUpdateExtensionsTest.cs)	(revision 4478bdf539df278f9e2aac0f9fe683c34ac55335)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilModelUpdateExtensionsTest.cs	(.../StochasticSoilModelUpdateExtensionsTest.cs)	(revision b2e7713ec43e71c2ad818b0f5d6405b6eab49e63)
@@ -428,10 +428,10 @@
             soilModel.Update(registry, context);
 
             // Assert
-            StochasticSoilModelSegmentPointEntity[] segmentPointEntites = context.StochasticSoilModelSegmentPointEntities.ToArray();
-            CollectionAssert.Contains(segmentPointEntites, originalPointEntity1);
-            CollectionAssert.Contains(segmentPointEntites, originalPointEntity2);
-            Assert.AreEqual(2, segmentPointEntites.Length);
+            StochasticSoilModelSegmentPointEntity[] segmentPointEntities = context.StochasticSoilModelSegmentPointEntities.ToArray();
+            CollectionAssert.Contains(segmentPointEntities, originalPointEntity1);
+            CollectionAssert.Contains(segmentPointEntities, originalPointEntity2);
+            Assert.AreEqual(2, segmentPointEntities.Length);
 
             mocks.VerifyAll();
         }