Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r9e1b97e9540df6cbd635120135c83de0260aa6d1 -re1413d482cd37476c01aaea03ae16efc50433f3e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 9e1b97e9540df6cbd635120135c83de0260aa6d1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision e1413d482cd37476c01aaea03ae16efc50433f3e)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 23-mei-2016 8:51:48 				*/
+/*  Created On : 23-mei-2016 13:26:35 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -179,7 +179,7 @@
 
 CREATE TABLE 'SurfaceLineEntity'
 (
-	'SurfaceLineEntityId' INTEGER NOT NULL PRIMARY KEY,
+	'SurfaceLineEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'FailureMechanismEntityId' INTEGER NOT NULL,
 	'Name' VARCHAR (255) NOT NULL,
 	'ReferenceLineIntersectionX' NUMERIC NOT NULL,
@@ -202,7 +202,7 @@
 
 CREATE TABLE 'CharacteristicPointEntity'
 (
-	'CharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY,
+	'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
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs
===================================================================
diff -u -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -re1413d482cd37476c01aaea03ae16efc50433f3e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs	(.../IRingtoetsEntities.cs)	(revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs	(.../IRingtoetsEntities.cs)	(revision e1413d482cd37476c01aaea03ae16efc50433f3e)
@@ -108,6 +108,12 @@
         /// </summary>
         DbSet<SurfaceLinePointEntity> SurfaceLinePointEntities { get; }
 
+        /// <summary>
+        /// Gets a <see cref="DbSet{TEntity}"/> of <see cref="CharacteristicPointEntity"/>
+        /// containing every characteristic point of piping surface lines in the database.
+        /// </summary>
+        DbSet<CharacteristicPointEntity> CharacteristicPointEntities { get; }
+
         /// <summary> 
         /// Persists all updates to the database and resets change tracking in the object context, see <see cref="ObjectContext.SaveChanges()"/>.
         /// </summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r9e1b97e9540df6cbd635120135c83de0260aa6d1 -re1413d482cd37476c01aaea03ae16efc50433f3e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision 9e1b97e9540df6cbd635120135c83de0260aa6d1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision e1413d482cd37476c01aaea03ae16efc50433f3e)
@@ -22,7 +22,7 @@
           <Key>
             <PropertyRef Name="CharacteristicPointEntityId" />
           </Key>
-          <Property Name="CharacteristicPointEntityId" Type="integer" Nullable="false" />
+          <Property Name="CharacteristicPointEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="CharacteristicPointType" Type="smallint" Nullable="false" />
           <Property Name="SurfaceLinePointEntityId" Type="integer" Nullable="false" />
         </EntityType>
@@ -121,7 +121,7 @@
           <Key>
             <PropertyRef Name="SurfaceLineEntityId" />
           </Key>
-          <Property Name="SurfaceLineEntityId" Type="integer" Nullable="false" />
+          <Property Name="SurfaceLineEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="FailureMechanismEntityId" Type="integer" Nullable="false" />
           <Property Name="Name" Type="varchar" MaxLength="255" Nullable="false" />
           <Property Name="ReferenceLineIntersectionX" Type="decimal" Precision="53" Scale="0" Nullable="false" />
@@ -466,7 +466,7 @@
           <Key>
             <PropertyRef Name="CharacteristicPointEntityId" />
           </Key>
-          <Property Name="CharacteristicPointEntityId" Type="Int64" Nullable="false" />
+          <Property Name="CharacteristicPointEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="CharacteristicPointType" Type="Int16" Nullable="false" />
           <Property Name="SurfaceLinePointEntityId" Type="Int64" Nullable="false" />
           <NavigationProperty Name="SurfaceLinePointEntity" Relationship="RingtoetsEntitiesModel.FK_CharacteristicPointEntity_0_0" FromRole="CharacteristicPointEntity" ToRole="SurfaceLinePointEntity" />
@@ -583,7 +583,7 @@
           <Key>
             <PropertyRef Name="SurfaceLineEntityId" />
           </Key>
-          <Property Name="SurfaceLineEntityId" Type="Int64" Nullable="false" />
+          <Property Name="SurfaceLineEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="FailureMechanismEntityId" Type="Int64" Nullable="false" />
           <Property Name="Name" Type="String" Nullable="false" MaxLength="255" FixedLength="false" Unicode="false" />
           <Property Name="ReferenceLineIntersectionX" Type="Decimal" Nullable="false" Precision="53" Scale="0" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r9e1b97e9540df6cbd635120135c83de0260aa6d1 -re1413d482cd37476c01aaea03ae16efc50433f3e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision 9e1b97e9540df6cbd635120135c83de0260aa6d1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision e1413d482cd37476c01aaea03ae16efc50433f3e)
@@ -6,19 +6,19 @@
     <edmx:Diagrams>
       <Diagram DiagramId="143406871b624a3080def7c3c31a548f" Name="Diagram1">
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.AssessmentSectionEntity" Width="1.5" PointX="3" PointY="7.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="12" PointY="11.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismEntity" Width="1.5" PointX="5.25" PointY="10.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="7.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionPointEntity" Width="1.5" PointX="9.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="1.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="12" PointY="7.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismEntity" Width="1.5" PointX="5.25" PointY="4.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="4.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionPointEntity" Width="1.5" PointX="9.75" PointY="4.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="13.625" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.ProjectEntity" Width="1.5" PointX="0.75" PointY="8.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ReferenceLinePointEntity" Width="1.5" PointX="5.25" PointY="4.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="17.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="17.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="14" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="14" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="10.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLinePointEntity" Width="1.5" PointX="9.75" PointY="10.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ReferenceLinePointEntity" Width="1.5" PointX="5.25" PointY="10.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="11.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="10.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="1.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="7.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLinePointEntity" Width="1.5" PointX="9.75" PointY="7.375" />
         <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_0_0" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs
===================================================================
diff -u -r845d2b0230eca6b2e9e94a2aec3fa36bd3c916b6 -re1413d482cd37476c01aaea03ae16efc50433f3e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs	(.../RingtoetsEntitiesHelper.cs)	(revision 845d2b0230eca6b2e9e94a2aec3fa36bd3c916b6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs	(.../RingtoetsEntitiesHelper.cs)	(revision e1413d482cd37476c01aaea03ae16efc50433f3e)
@@ -44,6 +44,7 @@
             DbSet<SoilLayerEntity> soilLayersSet = CreateEmptyTestDbSet<SoilLayerEntity>();
             DbSet<SurfaceLineEntity> surfaceLinesSet = CreateEmptyTestDbSet<SurfaceLineEntity>();
             DbSet<SurfaceLinePointEntity> surfaceLinePointsSet = CreateEmptyTestDbSet<SurfaceLinePointEntity>();
+            DbSet<CharacteristicPointEntity> characteristicPointsSet = CreateEmptyTestDbSet<CharacteristicPointEntity>();
 
             var ringtoetsEntities = mockRepository.Stub<IRingtoetsEntities>();
             ringtoetsEntities.Stub(r => r.ProjectEntities).Return(projectsSet);
@@ -59,6 +60,7 @@
             ringtoetsEntities.Stub(r => r.SoilLayerEntities).Return(soilLayersSet);
             ringtoetsEntities.Stub(r => r.SurfaceLineEntities).Return(surfaceLinesSet);
             ringtoetsEntities.Stub(r => r.SurfaceLinePointEntities).Return(surfaceLinePointsSet);
+            ringtoetsEntities.Stub(r => r.CharacteristicPointEntities).Return(characteristicPointsSet);
             return ringtoetsEntities;
         }