diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml
deleted file mode 100644
index c646a2e..0000000
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <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.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-  </component>
-</module>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml
deleted file mode 100644
index c646a2e..0000000
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <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.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml
deleted file mode 100644
index bac5915..0000000
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <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-jdbc-stats_main" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="simple-jdbc-stats_main" />
-</module>
\ No newline at end of file

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml
deleted file mode 100644
index c646a2e..0000000
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <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.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml
deleted file mode 100644
index bac5915..0000000
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <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-jdbc-stats_main" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="simple-jdbc-stats_main" />
-</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 467a563..8791f4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '1.6.1-SNAPSHOT'
+version '1.6.2-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -99,4 +99,3 @@
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
-

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml
deleted file mode 100644
index c646a2e..0000000
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <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.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml
deleted file mode 100644
index bac5915..0000000
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <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-jdbc-stats_main" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="simple-jdbc-stats_main" />
-</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 467a563..8791f4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '1.6.1-SNAPSHOT'
+version '1.6.2-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -99,4 +99,3 @@
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
-
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 67661df..44d09e6 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -4,11 +4,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -45,7 +47,7 @@
         private boolean autoCommit;
         private boolean formattedQueries;
         private StackTraceElement[] stackTrace = null;
-        private Set<Parameter> parameters = new HashSet<Parameter>();
+        private final Map<Integer, Parameter> parameters;
 
         public LogEntry(
                 int hash,
@@ -55,7 +57,7 @@
                 long nano,
                 boolean isAutoCommit,
                 boolean formattedQueries,
-                Set<Parameter> parameters
+                Map<Integer, Parameter> parameters
         ) {
             this.threadId = Thread.currentThread().getId();
             this.timeStamp = System.currentTimeMillis();
@@ -149,7 +151,8 @@
             StringBuilder result = new StringBuilder();
 
             if (parameters != null && !parameters.isEmpty()) {
-                for (Parameter parameter : parameters) {
+                for (Map.Entry<Integer, Parameter> parameterEntry : parameters.entrySet()) {
+                    Parameter parameter = parameterEntry.getValue();
                     result.append(String.format(
                             "%4s, %12s, %24s\n",
                             parameter.getIndex(),
@@ -218,7 +221,7 @@
             long nano,
             boolean isAutoCommit
     ) {
-        logEntry(type, sql, milli, nano, isAutoCommit, new HashSet<Parameter>());
+        logEntry(type, sql, milli, nano, isAutoCommit, new TreeMap<Integer, Parameter>());
     }
 
     public void logEntry(
@@ -227,7 +230,7 @@
             long milli,
             long nano,
             boolean isAutoCommit,
-            Set<Parameter> parameters
+            Map <Integer, Parameter> parameters
     ) {
         int hash = sql.hashCode();
         Driver.StatsLogger logger = Driver.get(port);

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml
deleted file mode 100644
index c646a2e..0000000
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <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.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml
deleted file mode 100644
index bac5915..0000000
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <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-jdbc-stats_main" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="simple-jdbc-stats_main" />
-</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 467a563..8791f4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '1.6.1-SNAPSHOT'
+version '1.6.2-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -99,4 +99,3 @@
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
-
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 67661df..44d09e6 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -4,11 +4,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -45,7 +47,7 @@
         private boolean autoCommit;
         private boolean formattedQueries;
         private StackTraceElement[] stackTrace = null;
-        private Set<Parameter> parameters = new HashSet<Parameter>();
+        private final Map<Integer, Parameter> parameters;
 
         public LogEntry(
                 int hash,
@@ -55,7 +57,7 @@
                 long nano,
                 boolean isAutoCommit,
                 boolean formattedQueries,
-                Set<Parameter> parameters
+                Map<Integer, Parameter> parameters
         ) {
             this.threadId = Thread.currentThread().getId();
             this.timeStamp = System.currentTimeMillis();
@@ -149,7 +151,8 @@
             StringBuilder result = new StringBuilder();
 
             if (parameters != null && !parameters.isEmpty()) {
-                for (Parameter parameter : parameters) {
+                for (Map.Entry<Integer, Parameter> parameterEntry : parameters.entrySet()) {
+                    Parameter parameter = parameterEntry.getValue();
                     result.append(String.format(
                             "%4s, %12s, %24s\n",
                             parameter.getIndex(),
@@ -218,7 +221,7 @@
             long nano,
             boolean isAutoCommit
     ) {
-        logEntry(type, sql, milli, nano, isAutoCommit, new HashSet<Parameter>());
+        logEntry(type, sql, milli, nano, isAutoCommit, new TreeMap<Integer, Parameter>());
     }
 
     public void logEntry(
@@ -227,7 +230,7 @@
             long milli,
             long nano,
             boolean isAutoCommit,
-            Set<Parameter> parameters
+            Map <Integer, Parameter> parameters
     ) {
         int hash = sql.hashCode();
         Driver.StatsLogger logger = Driver.get(port);
diff --git a/src/nl/astraeus/jdbc/PreparedStatementLogger.java b/src/nl/astraeus/jdbc/PreparedStatementLogger.java
index 016c384..f97959a 100644
--- a/src/nl/astraeus/jdbc/PreparedStatementLogger.java
+++ b/src/nl/astraeus/jdbc/PreparedStatementLogger.java
@@ -26,7 +26,10 @@
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 /**
@@ -46,17 +49,7 @@
     private long milli;
     private long nano;
 
-    private Set<Parameter> parameters = new TreeSet<Parameter>(new Comparator<Parameter>() {
-        public int compare(
-                Parameter o1,
-                Parameter o2
-        ) {
-            int x = o1.getIndex();
-            int y = o2.getIndex();
-
-            return (x < y) ? -1 : ((x == y) ? 0 : 1);
-        }
-    });
+    private final Map<Integer, Parameter> parameters = new TreeMap<Integer, Parameter>();
 
     public PreparedStatementLogger(JdbcLogger logger, PreparedStatement statement) throws SQLException {
         this.logger = logger;
@@ -75,7 +68,7 @@
         long m = System.currentTimeMillis() - milli;
         long n = System.nanoTime() - nano;
 
-        logger.logEntry(type, sql, m, n, autocommit, parameters);
+        logger.logEntry(type, sql, m, n, autocommit, new TreeMap<Integer, Parameter>(parameters));
     }
 
     public PreparedStatementLogger(JdbcLogger logger, Connection connection, String sql) throws SQLException {
@@ -255,242 +248,242 @@
 
     public void setNull(int parameterIndex, int sqlType) throws SQLException {
         statement.setNull(parameterIndex, sqlType);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NULL));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NULL));
     }
 
     public void setBoolean(int parameterIndex, boolean x) throws SQLException {
         statement.setBoolean(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BOOLEAN, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BOOLEAN, x));
     }
 
     public void setByte(int parameterIndex, byte x) throws SQLException {
         statement.setByte(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BYTE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BYTE, x));
     }
 
     public void setShort(int parameterIndex, short x) throws SQLException {
         statement.setShort(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.SHORT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.SHORT, x));
     }
 
     public void setInt(int parameterIndex, int x) throws SQLException {
         statement.setInt(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.INT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.INT, x));
     }
 
     public void setLong(int parameterIndex, long x) throws SQLException {
         statement.setLong(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.LONG, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.LONG, x));
     }
 
     public void setFloat(int parameterIndex, float x) throws SQLException {
         statement.setFloat(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.FLOAT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.FLOAT, x));
     }
 
     public void setDouble(int parameterIndex, double x) throws SQLException {
         statement.setDouble(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.DOUBLE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.DOUBLE, x));
     }
 
     public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
         statement.setBigDecimal(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIG_DECIMAL, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIG_DECIMAL, x));
     }
 
     public void setString(int parameterIndex, String x) throws SQLException {
         statement.setString(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.STRING, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.STRING, x));
     }
 
     public void setBytes(int parameterIndex, byte x[]) throws SQLException {
         statement.setBytes(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BYTES, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BYTES, x));
     }
 
     public void setDate(int parameterIndex, Date x) throws SQLException {
         statement.setDate(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
     }
 
     public void setTime(int parameterIndex, Time x) throws SQLException {
         statement.setTime(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
     }
 
     public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
         statement.setTimestamp(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
     }
 
     public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
         statement.setAsciiStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
     }
 
     public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
         statement.setUnicodeStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.UNICODE_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.UNICODE_STR));
     }
 
     public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
         statement.setBinaryStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
     }
 
     public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
         statement.setObject(parameterIndex, x, targetSqlType);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
     }
 
     public void setObject(int parameterIndex, Object x) throws SQLException {
         statement.setObject(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
     }
 
     public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
         statement.setCharacterStream(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR, reader));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR, reader));
     }
 
     public void setRef(int parameterIndex, Ref x) throws SQLException {
         statement.setRef(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.REF, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.REF, x));
     }
 
     public void setBlob(int parameterIndex, Blob x) throws SQLException {
         statement.setBlob(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BLOB, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BLOB, x));
     }
 
     public void setClob(int parameterIndex, Clob x) throws SQLException {
         statement.setClob(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CLOB, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CLOB, x));
     }
 
     public void setArray(int parameterIndex, Array x) throws SQLException {
         statement.setArray(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ARRAY, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ARRAY, x));
     }
 
     public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
         statement.setDate(parameterIndex, x, cal);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
     }
 
     public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
         statement.setTime(parameterIndex, x, cal);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
     }
 
     public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
         statement.setTimestamp(parameterIndex, x, cal);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
     }
 
     public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
         statement.setNull(parameterIndex, sqlType, typeName);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NULL));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NULL));
     }
 
     public void setURL(int parameterIndex, URL x) throws SQLException {
         statement.setURL(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.URL, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.URL, x));
     }
 
     public void setRowId(int parameterIndex, RowId x) throws SQLException {
         statement.setRowId(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ROW_ID, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ROW_ID, x));
     }
 
     public void setNString(int parameterIndex, String value) throws SQLException {
         statement.setNString(parameterIndex, value);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NSTRING, value));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NSTRING, value));
     }
 
     public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
         statement.setNCharacterStream(parameterIndex, value, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR, value));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR, value));
     }
 
     public void setNClob(int parameterIndex, NClob value) throws SQLException {
         statement.setNClob(parameterIndex, value);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCLOB, value));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCLOB, value));
     }
 
     public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
         statement.setClob(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CLOB, reader));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CLOB, reader));
     }
 
     public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
         statement.setBlob(parameterIndex, inputStream, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
     }
 
     public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
         statement.setNClob(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
     }
 
     public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
         statement.setSQLXML(parameterIndex, xmlObject);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.SQLXML));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.SQLXML));
     }
 
     public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
         statement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
     }
 
     public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
         statement.setAsciiStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
     }
 
     public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
         statement.setBinaryStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
     }
 
     public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
         statement.setCharacterStream(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
     }
 
     public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
         statement.setAsciiStream(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
     }
 
     public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
         statement.setBinaryStream(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
     }
 
     public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
         statement.setCharacterStream(parameterIndex, reader);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
     }
 
     public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
         statement.setNCharacterStream(parameterIndex, value);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR));
     }
 
     public void setClob(int parameterIndex, Reader reader) throws SQLException {
         statement.setClob(parameterIndex, reader);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CLOB));
     }
 
     public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
         statement.setBlob(parameterIndex, inputStream);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
     }
 
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         statement.setNClob(parameterIndex, reader);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
     }
 
 
@@ -501,6 +494,7 @@
         nano = 0;
 
         statement.close();
+        parameters.clear();
     }
 
     public ResultSetMetaData getMetaData() throws SQLException {
@@ -509,6 +503,7 @@
 
     public void clearParameters() throws SQLException {
         statement.clearParameters();
+        parameters.clear();
     }
 
     public ParameterMetaData getParameterMetaData() throws SQLException {

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5cbbdd6..41cd493 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.5">
       <module name="simple-jdbc-stats_main" target="1.5" />
       <module name="simple-jdbc-stats_test" target="1.5" />
       <module name="simple_jdbc_stats_main" target="1.5" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 267d99c..9dba9c4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..31e9036
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.astraeus.nl/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
deleted file mode 100644
index 80cfa8b..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.196">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/dd0034398d593aa3588c6773faac429bbd9aea0e/h2-1.4.196.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.196/1646e9e294b9c956a441bc383ca17a62c4b52311/h2-1.4.196-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
new file mode 100644
index 0000000..e005b69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_200.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.h2database:h2:1.4.200">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/f7533fe7cb8e99c87a43d325a77b4b678ad9031a/h2-1.4.200.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.200/3b5883b7a5a05b932c699760f0854ca565785a84/h2-1.4.200-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 04c10dd..8609c60 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: junit:junit:4.12">
+    <ANNOTATIONS>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/externalAnnotations/junit/junit/4.12-an1/junit-4.12-an1-annotations.zip!/" />
+    </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c6f0260..be926a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="IdProvider" IDEtalkID="EFE67BA311C7AEF8284203107B0CCCC4" />
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9398269..539e585 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_main.iml" group="simple-jdbc-stats" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats_test.iml" group="simple-jdbc-stats" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-jdbc-stats.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml
index ba2f28c..215d193 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="simple-jdbc-stats" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/simple-jdbc-stats.main.iml b/.idea/modules/simple-jdbc-stats.main.iml
new file mode 100644
index 0000000..578407e
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.main.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <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>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats.test.iml b/.idea/modules/simple-jdbc-stats.test.iml
new file mode 100644
index 0000000..62ffcca
--- /dev/null
+++ b/.idea/modules/simple-jdbc-stats.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <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-jdbc-stats.main" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.200" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-jdbc-stats.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml
deleted file mode 100644
index c646a2e..0000000
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <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.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml
deleted file mode 100644
index bac5915..0000000
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-jdbc-stats:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="1.6.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <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-jdbc-stats_main" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="simple-jdbc-stats_main" />
-</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 467a563..8791f4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '1.6.1-SNAPSHOT'
+version '1.6.2-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -99,4 +99,3 @@
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
-
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 67661df..44d09e6 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -4,11 +4,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -45,7 +47,7 @@
         private boolean autoCommit;
         private boolean formattedQueries;
         private StackTraceElement[] stackTrace = null;
-        private Set<Parameter> parameters = new HashSet<Parameter>();
+        private final Map<Integer, Parameter> parameters;
 
         public LogEntry(
                 int hash,
@@ -55,7 +57,7 @@
                 long nano,
                 boolean isAutoCommit,
                 boolean formattedQueries,
-                Set<Parameter> parameters
+                Map<Integer, Parameter> parameters
         ) {
             this.threadId = Thread.currentThread().getId();
             this.timeStamp = System.currentTimeMillis();
@@ -149,7 +151,8 @@
             StringBuilder result = new StringBuilder();
 
             if (parameters != null && !parameters.isEmpty()) {
-                for (Parameter parameter : parameters) {
+                for (Map.Entry<Integer, Parameter> parameterEntry : parameters.entrySet()) {
+                    Parameter parameter = parameterEntry.getValue();
                     result.append(String.format(
                             "%4s, %12s, %24s\n",
                             parameter.getIndex(),
@@ -218,7 +221,7 @@
             long nano,
             boolean isAutoCommit
     ) {
-        logEntry(type, sql, milli, nano, isAutoCommit, new HashSet<Parameter>());
+        logEntry(type, sql, milli, nano, isAutoCommit, new TreeMap<Integer, Parameter>());
     }
 
     public void logEntry(
@@ -227,7 +230,7 @@
             long milli,
             long nano,
             boolean isAutoCommit,
-            Set<Parameter> parameters
+            Map <Integer, Parameter> parameters
     ) {
         int hash = sql.hashCode();
         Driver.StatsLogger logger = Driver.get(port);
diff --git a/src/nl/astraeus/jdbc/PreparedStatementLogger.java b/src/nl/astraeus/jdbc/PreparedStatementLogger.java
index 016c384..f97959a 100644
--- a/src/nl/astraeus/jdbc/PreparedStatementLogger.java
+++ b/src/nl/astraeus/jdbc/PreparedStatementLogger.java
@@ -26,7 +26,10 @@
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 /**
@@ -46,17 +49,7 @@
     private long milli;
     private long nano;
 
-    private Set<Parameter> parameters = new TreeSet<Parameter>(new Comparator<Parameter>() {
-        public int compare(
-                Parameter o1,
-                Parameter o2
-        ) {
-            int x = o1.getIndex();
-            int y = o2.getIndex();
-
-            return (x < y) ? -1 : ((x == y) ? 0 : 1);
-        }
-    });
+    private final Map<Integer, Parameter> parameters = new TreeMap<Integer, Parameter>();
 
     public PreparedStatementLogger(JdbcLogger logger, PreparedStatement statement) throws SQLException {
         this.logger = logger;
@@ -75,7 +68,7 @@
         long m = System.currentTimeMillis() - milli;
         long n = System.nanoTime() - nano;
 
-        logger.logEntry(type, sql, m, n, autocommit, parameters);
+        logger.logEntry(type, sql, m, n, autocommit, new TreeMap<Integer, Parameter>(parameters));
     }
 
     public PreparedStatementLogger(JdbcLogger logger, Connection connection, String sql) throws SQLException {
@@ -255,242 +248,242 @@
 
     public void setNull(int parameterIndex, int sqlType) throws SQLException {
         statement.setNull(parameterIndex, sqlType);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NULL));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NULL));
     }
 
     public void setBoolean(int parameterIndex, boolean x) throws SQLException {
         statement.setBoolean(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BOOLEAN, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BOOLEAN, x));
     }
 
     public void setByte(int parameterIndex, byte x) throws SQLException {
         statement.setByte(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BYTE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BYTE, x));
     }
 
     public void setShort(int parameterIndex, short x) throws SQLException {
         statement.setShort(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.SHORT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.SHORT, x));
     }
 
     public void setInt(int parameterIndex, int x) throws SQLException {
         statement.setInt(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.INT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.INT, x));
     }
 
     public void setLong(int parameterIndex, long x) throws SQLException {
         statement.setLong(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.LONG, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.LONG, x));
     }
 
     public void setFloat(int parameterIndex, float x) throws SQLException {
         statement.setFloat(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.FLOAT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.FLOAT, x));
     }
 
     public void setDouble(int parameterIndex, double x) throws SQLException {
         statement.setDouble(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.DOUBLE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.DOUBLE, x));
     }
 
     public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
         statement.setBigDecimal(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIG_DECIMAL, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIG_DECIMAL, x));
     }
 
     public void setString(int parameterIndex, String x) throws SQLException {
         statement.setString(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.STRING, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.STRING, x));
     }
 
     public void setBytes(int parameterIndex, byte x[]) throws SQLException {
         statement.setBytes(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BYTES, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BYTES, x));
     }
 
     public void setDate(int parameterIndex, Date x) throws SQLException {
         statement.setDate(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
     }
 
     public void setTime(int parameterIndex, Time x) throws SQLException {
         statement.setTime(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
     }
 
     public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
         statement.setTimestamp(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
     }
 
     public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
         statement.setAsciiStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
     }
 
     public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
         statement.setUnicodeStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.UNICODE_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.UNICODE_STR));
     }
 
     public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
         statement.setBinaryStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
     }
 
     public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
         statement.setObject(parameterIndex, x, targetSqlType);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
     }
 
     public void setObject(int parameterIndex, Object x) throws SQLException {
         statement.setObject(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
     }
 
     public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
         statement.setCharacterStream(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR, reader));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR, reader));
     }
 
     public void setRef(int parameterIndex, Ref x) throws SQLException {
         statement.setRef(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.REF, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.REF, x));
     }
 
     public void setBlob(int parameterIndex, Blob x) throws SQLException {
         statement.setBlob(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BLOB, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BLOB, x));
     }
 
     public void setClob(int parameterIndex, Clob x) throws SQLException {
         statement.setClob(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CLOB, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CLOB, x));
     }
 
     public void setArray(int parameterIndex, Array x) throws SQLException {
         statement.setArray(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ARRAY, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ARRAY, x));
     }
 
     public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
         statement.setDate(parameterIndex, x, cal);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.DATE, x));
     }
 
     public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
         statement.setTime(parameterIndex, x, cal);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIME, x));
     }
 
     public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
         statement.setTimestamp(parameterIndex, x, cal);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.TIMESTAMP, x));
     }
 
     public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
         statement.setNull(parameterIndex, sqlType, typeName);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NULL));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NULL));
     }
 
     public void setURL(int parameterIndex, URL x) throws SQLException {
         statement.setURL(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.URL, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.URL, x));
     }
 
     public void setRowId(int parameterIndex, RowId x) throws SQLException {
         statement.setRowId(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ROW_ID, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ROW_ID, x));
     }
 
     public void setNString(int parameterIndex, String value) throws SQLException {
         statement.setNString(parameterIndex, value);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NSTRING, value));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NSTRING, value));
     }
 
     public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
         statement.setNCharacterStream(parameterIndex, value, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR, value));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR, value));
     }
 
     public void setNClob(int parameterIndex, NClob value) throws SQLException {
         statement.setNClob(parameterIndex, value);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCLOB, value));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCLOB, value));
     }
 
     public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
         statement.setClob(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CLOB, reader));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CLOB, reader));
     }
 
     public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
         statement.setBlob(parameterIndex, inputStream, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
     }
 
     public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
         statement.setNClob(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
     }
 
     public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
         statement.setSQLXML(parameterIndex, xmlObject);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.SQLXML));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.SQLXML));
     }
 
     public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
         statement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.OBJECT, x));
     }
 
     public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
         statement.setAsciiStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
     }
 
     public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
         statement.setBinaryStream(parameterIndex, x, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
     }
 
     public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
         statement.setCharacterStream(parameterIndex, reader, length);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
     }
 
     public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
         statement.setAsciiStream(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.ASCII_STR));
     }
 
     public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
         statement.setBinaryStream(parameterIndex, x);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BIN_STR));
     }
 
     public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
         statement.setCharacterStream(parameterIndex, reader);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CHAR_STR));
     }
 
     public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
         statement.setNCharacterStream(parameterIndex, value);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCHAR_STR));
     }
 
     public void setClob(int parameterIndex, Reader reader) throws SQLException {
         statement.setClob(parameterIndex, reader);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.CLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.CLOB));
     }
 
     public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
         statement.setBlob(parameterIndex, inputStream);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.BLOB));
     }
 
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         statement.setNClob(parameterIndex, reader);
-        parameters.add(new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
+        parameters.put(parameterIndex, new Parameter(parameterIndex, Parameter.ParameterType.NCLOB));
     }
 
 
@@ -501,6 +494,7 @@
         nano = 0;
 
         statement.close();
+        parameters.clear();
     }
 
     public ResultSetMetaData getMetaData() throws SQLException {
@@ -509,6 +503,7 @@
 
     public void clearParameters() throws SQLException {
         statement.clearParameters();
+        parameters.clear();
     }
 
     public ParameterMetaData getParameterMetaData() throws SQLException {
diff --git a/src/nl/astraeus/jdbc/web/page/ShowStacktrace.java b/src/nl/astraeus/jdbc/web/page/ShowStacktrace.java
index 5d34818..0b9cb86 100644
--- a/src/nl/astraeus/jdbc/web/page/ShowStacktrace.java
+++ b/src/nl/astraeus/jdbc/web/page/ShowStacktrace.java
@@ -6,9 +6,11 @@
 import nl.astraeus.jdbc.SqlFormatter;
 import nl.astraeus.web.page.Message;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * User: rnentjes
@@ -49,7 +51,7 @@
                     0,
                     false,
                     true,
-                    new HashSet<Parameter>()
+                    new HashMap<Integer, Parameter>()
             );
             logEntry.setStackTrace(new StackTraceElement[0]);
         }