Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -47,10 +47,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
Index: Application/Riskeer/src/Application.Riskeer/app.config
===================================================================
diff -u -r19617b5084e01324a9b040f965a96b3d18b63910 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Application/Riskeer/src/Application.Riskeer/app.config	(.../app.config)	(revision 19617b5084e01324a9b040f965a96b3d18b63910)
+++ Application/Riskeer/src/Application.Riskeer/app.config	(.../app.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
 This file is part of Riskeer.
@@ -20,7 +21,6 @@
 Stichting Deltares and remain full property of Stichting Deltares at all times.
 All rights reserved.
 -->
-
 <!-- 
 Do not change automatically generated sections here, 
 they have to be changed in the Properties.Settings.settings file instead (from VS) 
@@ -32,6 +32,7 @@
     <section name="castle" type="Castle.Windsor.Configuration.AppDomain.CastleSectionHandler, Castle.Windsor" />
 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <appSettings>
     <!-- outputlog4net's debug information to the Visual Studio output debug window -->
Index: Application/Riskeer/src/Application.Riskeer/packages.config
===================================================================
diff -u -ra68b5de047f66befb2a38f2694860943b9e2c32e -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Application/Riskeer/src/Application.Riskeer/packages.config	(.../packages.config)	(revision a68b5de047f66befb2a38f2694860943b9e2c32e)
+++ Application/Riskeer/src/Application.Riskeer/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
 This file is part of Riskeer.
@@ -21,7 +22,7 @@
 All rights reserved.
 -->
 <packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net40" />
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/App.config
===================================================================
diff -u -rcb6d0d0e0260d373f0ade513d28e6ffcfc28a138 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/App.config	(.../App.config)	(revision cb6d0d0e0260d373f0ade513d28e6ffcfc28a138)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/App.config	(.../App.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
@@ -23,8 +23,8 @@
 -->
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@@ -33,8 +33,8 @@
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <system.data>
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj	(.../Application.Riskeer.Integration.Test.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj	(.../Application.Riskeer.Integration.Test.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -8,10 +8,10 @@
   <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/packages.config
===================================================================
diff -u -ra68b5de047f66befb2a38f2694860943b9e2c32e -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/packages.config	(.../packages.config)	(revision a68b5de047f66befb2a38f2694860943b9e2c32e)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -22,7 +22,7 @@
 All rights reserved.
 -->
 <packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/App.config
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/App.config	(.../App.config)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/App.config	(.../App.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
@@ -23,8 +23,8 @@
 -->
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@@ -33,8 +33,8 @@
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <system.data>
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}</ProjectGuid>
@@ -11,10 +11,10 @@
       <HintPath>..\..\..\..\packages\BruTile.0.19.0\lib\net40\BruTile.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/packages.config
===================================================================
diff -u -rb1ff62dd72bad21ea527fac797675980f7eb1dae -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/packages.config	(.../packages.config)	(revision b1ff62dd72bad21ea527fac797675980f7eb1dae)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -23,7 +23,7 @@
 -->
 <packages>
   <package id="BruTile" version="0.19.0" targetFramework="net40" />
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
Index: Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/App.config
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/App.config	(.../App.config)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/App.config	(.../App.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
@@ -23,13 +23,14 @@
 -->
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"></defaultConnectionFactory>
     <providers>
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <system.data>
Index: Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/Riskeer.Migration.Core.TestUtil.Test.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/Riskeer.Migration.Core.TestUtil.Test.csproj	(.../Riskeer.Migration.Core.TestUtil.Test.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/Riskeer.Migration.Core.TestUtil.Test.csproj	(.../Riskeer.Migration.Core.TestUtil.Test.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -8,10 +8,10 @@
   <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
Index: Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/packages.config
===================================================================
diff -u -ra68b5de047f66befb2a38f2694860943b9e2c32e -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/packages.config	(.../packages.config)	(revision a68b5de047f66befb2a38f2694860943b9e2c32e)
+++ Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -22,7 +22,7 @@
 All rights reserved.
 -->
 <packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net40" />
   <package id="System.Data.SQLite.EF6" version="1.0.109.0" targetFramework="net40" />
Index: Riskeer/Storage/src/Riskeer.Storage.Core/App.config
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/src/Riskeer.Storage.Core/App.config	(.../App.config)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/App.config	(.../App.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
 This file is part of Riskeer.
@@ -22,19 +23,19 @@
 -->
 <configuration>
   <configSections>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"></defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6"/>
+      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
     </providers>
   </entityFramework>
   <system.data>
     <DbProviderFactories>
-      <remove invariant="System.Data.SQLite.EF6"/>
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"/>
+      <remove invariant="System.Data.SQLite.EF6" />
+      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
     </DbProviderFactories>
   </system.data>
 </configuration>
\ No newline at end of file
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Riskeer.Storage.Core.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/src/Riskeer.Storage.Core/Riskeer.Storage.Core.csproj	(.../Riskeer.Storage.Core.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Riskeer.Storage.Core.csproj	(.../Riskeer.Storage.Core.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{50963F12-448C-41BA-A62C-CDB0AB8D21E0}</ProjectGuid>
@@ -8,14 +8,17 @@
   <Import Project="$(SolutionDir)\build\Riskeer.targets" />
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
Index: Riskeer/Storage/src/Riskeer.Storage.Core/packages.config
===================================================================
diff -u -ra68b5de047f66befb2a38f2694860943b9e2c32e -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/src/Riskeer.Storage.Core/packages.config	(.../packages.config)	(revision a68b5de047f66befb2a38f2694860943b9e2c32e)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
 This file is part of Riskeer.
@@ -21,7 +22,7 @@
 All rights reserved.
 -->
 <packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net40" />
   <package id="System.Data.SQLite.EF6" version="1.0.109.0" targetFramework="net40" />
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/App.config
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/App.config	(.../App.config)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/App.config	(.../App.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
 This file is part of Riskeer.
@@ -22,8 +23,8 @@
 -->
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"></defaultConnectionFactory>
@@ -35,6 +36,6 @@
     <DbProviderFactories>
       <remove invariant="System.Data.SQLite.EF6" />
       <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-     </DbProviderFactories>
+    </DbProviderFactories>
   </system.data>
 </configuration>
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj	(.../Riskeer.Storage.Core.Test.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj	(.../Riskeer.Storage.Core.Test.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -8,7 +8,7 @@
   <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/packages.config
===================================================================
diff -u -ra68b5de047f66befb2a38f2694860943b9e2c32e -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/packages.config	(.../packages.config)	(revision a68b5de047f66befb2a38f2694860943b9e2c32e)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -22,7 +22,7 @@
 All rights reserved.
 -->
 <packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/App.config
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/App.config	(.../App.config)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/App.config	(.../App.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2019. All rights reserved.
 
 This file is part of Riskeer.
@@ -22,13 +23,14 @@
 -->
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"></defaultConnectionFactory>
     <providers>
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <system.data>
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/Riskeer.Storage.Core.TestUtil.Test.csproj
===================================================================
diff -u -r022dcfe9449faa26abb61883170d5d07e5219fa3 -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/Riskeer.Storage.Core.TestUtil.Test.csproj	(.../Riskeer.Storage.Core.TestUtil.Test.csproj)	(revision 022dcfe9449faa26abb61883170d5d07e5219fa3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/Riskeer.Storage.Core.TestUtil.Test.csproj	(.../Riskeer.Storage.Core.TestUtil.Test.csproj)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -7,11 +7,15 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
   <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/packages.config
===================================================================
diff -u -ra68b5de047f66befb2a38f2694860943b9e2c32e -r40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/packages.config	(.../packages.config)	(revision a68b5de047f66befb2a38f2694860943b9e2c32e)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/packages.config	(.../packages.config)	(revision 40baea1ba5a7e16d4a1bfe9c0c5bd6626629938d)
@@ -22,7 +22,7 @@
 All rights reserved.
 -->
 <packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net40" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net40" />
   <package id="System.Data.SQLite.EF6" version="1.0.109.0" targetFramework="net40" />