diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml
new file mode 100644
index 0000000..b214a6e
--- /dev/null
+++ b/.idea/modules/simple-database.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml
new file mode 100644
index 0000000..b214a6e
--- /dev/null
+++ b/.idea/modules/simple-database.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml
new file mode 100644
index 0000000..aa4c3ee
--- /dev/null
+++ b/.idea/modules/simple_database_main.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml
new file mode 100644
index 0000000..b214a6e
--- /dev/null
+++ b/.idea/modules/simple-database.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml
new file mode 100644
index 0000000..aa4c3ee
--- /dev/null
+++ b/.idea/modules/simple_database_main.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml
new file mode 100644
index 0000000..7e69a59
--- /dev/null
+++ b/.idea/modules/simple_database_test.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="simple_database_main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml
new file mode 100644
index 0000000..b214a6e
--- /dev/null
+++ b/.idea/modules/simple-database.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml
new file mode 100644
index 0000000..aa4c3ee
--- /dev/null
+++ b/.idea/modules/simple_database_main.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml
new file mode 100644
index 0000000..7e69a59
--- /dev/null
+++ b/.idea/modules/simple_database_test.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="simple_database_main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index cdaf7bd..a68b59d 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -28,6 +28,5 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml
new file mode 100644
index 0000000..b214a6e
--- /dev/null
+++ b/.idea/modules/simple-database.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml
new file mode 100644
index 0000000..aa4c3ee
--- /dev/null
+++ b/.idea/modules/simple_database_main.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml
new file mode 100644
index 0000000..7e69a59
--- /dev/null
+++ b/.idea/modules/simple_database_test.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="simple_database_main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index cdaf7bd..a68b59d 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -28,6 +28,5 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/simple-database.iml b/simple-database.iml
deleted file mode 100644
index 00c6f92..0000000
--- a/simple-database.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-  </component>
-</module>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
index ddf736d..d7f05b9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimpleDatabase
\ No newline at end of file
+simple-database
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e2aa85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,9 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple_database_main" target="1.7" />
+      <module name="simple_database_test" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index b2449d1..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/8e20852d05222dc286bf1c71d78d0531e177c317/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.12/58697792617f38bf86d8e26bc004aac505e516a9/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..b55c3b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/7fcf30c25b8f4a9379b9dad0d3f487b25272c026/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.13/96e785df399a4e1a6c030877097807b7e18520cc/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
deleted file mode 100644
index ea11182..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/42db62298b899818ff17352cbc00050e940bbfb0/slf4j-simple-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.12/2820c828d59e66efe424f2ea529f5a8b86b7254d/slf4j-simple-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
new file mode 100644
index 0000000..d179f62
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.slf4j:slf4j-simple:1.7.13">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/8f0d8b5bf0ff295162360a0a5ebb9c945bd2b685/slf4j-simple-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.13/94068657ccce29fd6c93ed770c394213fcc9b41a/slf4j-simple-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3941471..d9454bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="IdProvider" IDEtalkID="08288B9D4E29EF8D737DE065B33ED36A" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f9bb72..53ddb09 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/simple-database.iml" filepath="$PROJECT_DIR$/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_main.iml" group="simple-database" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple_database_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple_database_test.iml" group="simple-database" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml
new file mode 100644
index 0000000..b214a6e
--- /dev/null
+++ b/.idea/modules/simple-database.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml
new file mode 100644
index 0000000..aa4c3ee
--- /dev/null
+++ b/.idea/modules/simple_database_main.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml
new file mode 100644
index 0000000..7e69a59
--- /dev/null
+++ b/.idea/modules/simple_database_test.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="simple_database_main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.13" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index cdaf7bd..a68b59d 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -28,6 +28,5 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/simple-database.iml b/simple-database.iml
deleted file mode 100644
index 00c6f92..0000000
--- a/simple-database.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-database" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.190" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java
index 700c3e4..d89621a 100644
--- a/src/nl/astraeus/database/FieldMetaData.java
+++ b/src/nl/astraeus/database/FieldMetaData.java
@@ -78,6 +78,8 @@
         sqlTypeMapping.put(int.class, Types.INTEGER);
         sqlTypeMapping.put(Short.class, Types.SMALLINT);
         sqlTypeMapping.put(short.class, Types.SMALLINT);
+        sqlTypeMapping.put(Float.class, Types.DECIMAL);
+        sqlTypeMapping.put(float.class, Types.DECIMAL);
         sqlTypeMapping.put(Double.class, Types.DECIMAL);
         sqlTypeMapping.put(double.class, Types.DECIMAL);
         sqlTypeMapping.put(Boolean.class, Types.BOOLEAN);