diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1d052b3..6729659 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,38 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="17f8d10d-4c97-4aa9-b7ad-cdd73e5a615c" name="Default" comment="Playing with SimpleDatabase">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/BaseTest.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnection.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/MetaDataHandler.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/Persister.java" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/simple/SimpleDao.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/SimpleDao.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/simple/SimpleDatabase.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java" />
+    <list default="true" id="17f8d10d-4c97-4aa9-b7ad-cdd73e5a615c" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/DdlMapping.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/DdlMapping.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ExecuteSelect.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/ExecuteSelect.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/FieldMetaData.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/FieldMetaData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ReferentList.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/ReferentList.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/cache/Cache.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/cache/Cache.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/DdlMappingTest.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/DdlMappingTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/Example.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/Example.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestCache.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestCache.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestCollection.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestCollection.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestCompoundPK.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestCompoundPK.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestDataTypes.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestDataTypes.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestDelete.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestDelete.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestFind.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestFind.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestInsert.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestInsert.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestReference.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestReference.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectAll.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectAll.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectFrom.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectFrom.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestUpdate.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestUpdate.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" />
     </list>
     <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -140,21 +110,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="TestSimpleDatabaseInsert.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="162">
-              <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="SimpleDatabase.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="82" column="5" lean-forward="true" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
+            <state relative-caret-position="123">
+              <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1135#1136#0" expanded="true" />
@@ -171,7 +131,7 @@
       <file leaf-file-name="SimpleDao.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDao.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="142">
+            <state relative-caret-position="123">
               <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
               <folding>
                 <element signature="e#258#259#0" expanded="true" />
@@ -194,14 +154,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TestMetaData.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="TestMetaData.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="320">
-              <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+            <state relative-caret-position="666">
+              <caret line="47" column="8" lean-forward="false" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
               <folding>
-                <element signature="e#560#1177#0" expanded="true" />
-                <element signature="e#1176#1177#0" expanded="true" />
+                <element signature="e#560#1195#0" expanded="true" />
+                <element signature="e#1194#1195#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TestMissingReference.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="198">
+              <caret line="23" column="83" lean-forward="false" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="83" />
+              <folding>
+                <marker date="1481386876372" expanded="false" signature="1295:1314" ph=" { " />
+                <marker date="1481386876372" expanded="false" signature="1330:1344" ph=" }" />
+                <marker date="1481386876372" expanded="false" signature="1772:1791" ph=" { " />
+                <marker date="1481386876372" expanded="false" signature="1806:1820" ph=" }" />
               </folding>
             </state>
           </provider>
@@ -231,11 +206,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MetaData.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="MetaData.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="142">
-              <caret line="280" column="0" lean-forward="false" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
+            <state relative-caret-position="223">
+              <caret line="251" column="34" lean-forward="true" selection-start-line="251" selection-start-column="34" selection-end-line="251" selection-end-column="34" />
               <folding>
                 <element signature="e#9896#10687#0" expanded="true" />
                 <element signature="e#10686#10687#0" expanded="true" />
@@ -244,21 +219,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ObjectPersister.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
+      <file leaf-file-name="ExecuteConnectionWithResult.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnectionWithResult.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+            <state relative-caret-position="198">
+              <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TestSelectWhere.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java">
+      <file leaf-file-name="ObjectPersister.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+            <state relative-caret-position="159">
+              <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -721,8 +696,8 @@
         <option value="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java" />
         <option value="$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java" />
         <option value="$PROJECT_DIR$/test/nl/astraeus/database/TestUpdate.java" />
-        <option value="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" />
         <option value="$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java" />
+        <option value="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" />
       </list>
     </option>
   </component>
@@ -1227,7 +1202,7 @@
       <workItem from="1481273548871" duration="226000" />
       <workItem from="1481274277594" duration="990000" />
       <workItem from="1481369293467" duration="7371000" />
-      <workItem from="1481379875049" duration="7428000" />
+      <workItem from="1481379875049" duration="7738000" />
     </task>
     <task id="LOCAL-00001" summary="Intellij settings">
       <created>1445189967799</created>
@@ -1313,7 +1288,14 @@
       <option name="project" value="LOCAL" />
       <updated>1481380884314</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="Playing with SimpleDatabase">
+      <created>1481387310123</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1481387310123</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1343,7 +1325,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27137000" />
+    <option name="totallyTimeSpent" value="27447000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1368,7 +1350,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24982053" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.49198398" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41282564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13527054" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1421,15 +1403,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java</url>
-          <line>90</line>
-          <properties />
-          <option name="timeStamp" value="6" />
-        </line-breakpoint>
-      </breakpoints>
-      <option name="time" value="8" />
+      <option name="time" value="9" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1622,14 +1596,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnectionWithResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="10" column="33" lean-forward="false" selection-start-line="10" selection-start-column="33" selection-end-line="10" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnection.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1760,19 +1726,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-          <folding>
-            <marker date="1481386876372" expanded="false" signature="1295:1314" ph=" { " />
-            <marker date="1481386876372" expanded="false" signature="1330:1344" ph=" }" />
-            <marker date="1481386876372" expanded="false" signature="1772:1791" ph=" { " />
-            <marker date="1481386876372" expanded="false" signature="1806:1820" ph=" }" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestReference.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1845,8 +1798,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="82" column="5" lean-forward="true" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
+        <state relative-caret-position="123">
+          <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1135#1136#0" expanded="true" />
@@ -1859,28 +1812,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="280" column="0" lean-forward="false" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
-          <folding>
-            <element signature="e#9896#10687#0" expanded="true" />
-            <element signature="e#10686#10687#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
+        <state relative-caret-position="123">
           <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
           <folding>
             <element signature="e#258#259#0" expanded="true" />
@@ -1890,13 +1824,53 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnectionWithResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="23" column="83" lean-forward="false" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="83" />
+          <folding>
+            <marker date="1481386876372" expanded="false" signature="1295:1314" ph=" { " />
+            <marker date="1481386876372" expanded="false" signature="1330:1344" ph=" }" />
+            <marker date="1481386876372" expanded="false" signature="1772:1791" ph=" { " />
+            <marker date="1481386876372" expanded="false" signature="1806:1820" ph=" }" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+        <state relative-caret-position="666">
+          <caret line="47" column="8" lean-forward="false" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
           <folding>
-            <element signature="e#560#1177#0" expanded="true" />
-            <element signature="e#1176#1177#0" expanded="true" />
+            <element signature="e#560#1195#0" expanded="true" />
+            <element signature="e#1194#1195#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="223">
+          <caret line="251" column="34" lean-forward="true" selection-start-line="251" selection-start-column="34" selection-end-line="251" selection-end-column="34" />
+          <folding>
+            <element signature="e#9896#10687#0" expanded="true" />
+            <element signature="e#10686#10687#0" expanded="true" />
           </folding>
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1d052b3..6729659 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,38 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="17f8d10d-4c97-4aa9-b7ad-cdd73e5a615c" name="Default" comment="Playing with SimpleDatabase">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/BaseTest.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnection.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/MetaDataHandler.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/Persister.java" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/simple/SimpleDao.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/SimpleDao.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/simple/SimpleDatabase.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java" />
+    <list default="true" id="17f8d10d-4c97-4aa9-b7ad-cdd73e5a615c" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/DdlMapping.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/DdlMapping.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ExecuteSelect.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/ExecuteSelect.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/FieldMetaData.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/FieldMetaData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/ReferentList.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/ReferentList.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/nl/astraeus/database/cache/Cache.java" afterPath="$PROJECT_DIR$/src/nl/astraeus/database/cache/Cache.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/DdlMappingTest.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/DdlMappingTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/Example.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/Example.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestCache.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestCache.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestCollection.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestCollection.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestCompoundPK.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestCompoundPK.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestDataTypes.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestDataTypes.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestDelete.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestDelete.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestFind.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestFind.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestInsert.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestInsert.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestReference.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestReference.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectAll.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectAll.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectFrom.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectFrom.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/TestUpdate.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/TestUpdate.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" afterPath="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" />
     </list>
     <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -140,21 +110,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="TestSimpleDatabaseInsert.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="162">
-              <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="SimpleDatabase.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="82" column="5" lean-forward="true" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
+            <state relative-caret-position="123">
+              <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1135#1136#0" expanded="true" />
@@ -171,7 +131,7 @@
       <file leaf-file-name="SimpleDao.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDao.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="142">
+            <state relative-caret-position="123">
               <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
               <folding>
                 <element signature="e#258#259#0" expanded="true" />
@@ -194,14 +154,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TestMetaData.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="TestMetaData.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="320">
-              <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+            <state relative-caret-position="666">
+              <caret line="47" column="8" lean-forward="false" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
               <folding>
-                <element signature="e#560#1177#0" expanded="true" />
-                <element signature="e#1176#1177#0" expanded="true" />
+                <element signature="e#560#1195#0" expanded="true" />
+                <element signature="e#1194#1195#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TestMissingReference.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="198">
+              <caret line="23" column="83" lean-forward="false" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="83" />
+              <folding>
+                <marker date="1481386876372" expanded="false" signature="1295:1314" ph=" { " />
+                <marker date="1481386876372" expanded="false" signature="1330:1344" ph=" }" />
+                <marker date="1481386876372" expanded="false" signature="1772:1791" ph=" { " />
+                <marker date="1481386876372" expanded="false" signature="1806:1820" ph=" }" />
               </folding>
             </state>
           </provider>
@@ -231,11 +206,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MetaData.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="MetaData.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="142">
-              <caret line="280" column="0" lean-forward="false" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
+            <state relative-caret-position="223">
+              <caret line="251" column="34" lean-forward="true" selection-start-line="251" selection-start-column="34" selection-end-line="251" selection-end-column="34" />
               <folding>
                 <element signature="e#9896#10687#0" expanded="true" />
                 <element signature="e#10686#10687#0" expanded="true" />
@@ -244,21 +219,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ObjectPersister.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
+      <file leaf-file-name="ExecuteConnectionWithResult.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnectionWithResult.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+            <state relative-caret-position="198">
+              <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TestSelectWhere.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java">
+      <file leaf-file-name="ObjectPersister.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+            <state relative-caret-position="159">
+              <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -721,8 +696,8 @@
         <option value="$PROJECT_DIR$/test/nl/astraeus/database/TestSelectWhere.java" />
         <option value="$PROJECT_DIR$/test/nl/astraeus/database/TestSimpleDatabaseInsert.java" />
         <option value="$PROJECT_DIR$/test/nl/astraeus/database/TestUpdate.java" />
-        <option value="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" />
         <option value="$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java" />
+        <option value="$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java" />
       </list>
     </option>
   </component>
@@ -1227,7 +1202,7 @@
       <workItem from="1481273548871" duration="226000" />
       <workItem from="1481274277594" duration="990000" />
       <workItem from="1481369293467" duration="7371000" />
-      <workItem from="1481379875049" duration="7428000" />
+      <workItem from="1481379875049" duration="7738000" />
     </task>
     <task id="LOCAL-00001" summary="Intellij settings">
       <created>1445189967799</created>
@@ -1313,7 +1288,14 @@
       <option name="project" value="LOCAL" />
       <updated>1481380884314</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="Playing with SimpleDatabase">
+      <created>1481387310123</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1481387310123</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1343,7 +1325,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27137000" />
+    <option name="totallyTimeSpent" value="27447000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1368,7 +1350,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24982053" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.49198398" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41282564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13527054" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1421,15 +1403,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java</url>
-          <line>90</line>
-          <properties />
-          <option name="timeStamp" value="6" />
-        </line-breakpoint>
-      </breakpoints>
-      <option name="time" value="8" />
+      <option name="time" value="9" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1622,14 +1596,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnectionWithResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="10" column="33" lean-forward="false" selection-start-line="10" selection-start-column="33" selection-end-line="10" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnection.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1760,19 +1726,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-          <folding>
-            <marker date="1481386876372" expanded="false" signature="1295:1314" ph=" { " />
-            <marker date="1481386876372" expanded="false" signature="1330:1344" ph=" }" />
-            <marker date="1481386876372" expanded="false" signature="1772:1791" ph=" { " />
-            <marker date="1481386876372" expanded="false" signature="1806:1820" ph=" }" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestReference.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1845,8 +1798,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDatabase.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="82" column="5" lean-forward="true" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
+        <state relative-caret-position="123">
+          <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1135#1136#0" expanded="true" />
@@ -1859,28 +1812,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="280" column="0" lean-forward="false" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
-          <folding>
-            <element signature="e#9896#10687#0" expanded="true" />
-            <element signature="e#10686#10687#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/SimpleDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
+        <state relative-caret-position="123">
           <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
           <folding>
             <element signature="e#258#259#0" expanded="true" />
@@ -1890,13 +1824,53 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ExecuteConnectionWithResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/ObjectPersister.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/TestMissingReference.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="23" column="83" lean-forward="false" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="83" />
+          <folding>
+            <marker date="1481386876372" expanded="false" signature="1295:1314" ph=" { " />
+            <marker date="1481386876372" expanded="false" signature="1330:1344" ph=" }" />
+            <marker date="1481386876372" expanded="false" signature="1772:1791" ph=" { " />
+            <marker date="1481386876372" expanded="false" signature="1806:1820" ph=" }" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/nl/astraeus/database/test/metadata/TestMetaData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+        <state relative-caret-position="666">
+          <caret line="47" column="8" lean-forward="false" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
           <folding>
-            <element signature="e#560#1177#0" expanded="true" />
-            <element signature="e#1176#1177#0" expanded="true" />
+            <element signature="e#560#1195#0" expanded="true" />
+            <element signature="e#1194#1195#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/nl/astraeus/database/MetaData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="223">
+          <caret line="251" column="34" lean-forward="true" selection-start-line="251" selection-start-column="34" selection-end-line="251" selection-end-column="34" />
+          <folding>
+            <element signature="e#9896#10687#0" expanded="true" />
+            <element signature="e#10686#10687#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/test/nl/astraeus/database/test/metadata/TestMetaData.java b/test/nl/astraeus/database/test/metadata/TestMetaData.java
index 2a5116f..7c6139f 100644
--- a/test/nl/astraeus/database/test/metadata/TestMetaData.java
+++ b/test/nl/astraeus/database/test/metadata/TestMetaData.java
@@ -26,7 +26,7 @@
                 try {
                     Class.forName("org.h2.Driver");
 
-                    Connection connection = DriverManager.getConnection("jdbc:h2:mem:Test", "sa", "");
+                    Connection connection = DriverManager.getConnection("jdbc:h2:mem:Test;DB_CLOSE_DELAY=-1", "sa", "");
                     connection.setAutoCommit(false);
 
                     return connection;