diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </modules>
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </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
index 3b8dfae..dff0656 100644
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ b/.idea/modules/simple-jdbc-stats_main.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -10,11 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.193" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </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
index 3b8dfae..dff0656 100644
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ b/.idea/modules/simple-jdbc-stats_main.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -10,11 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.193" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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
index 03d17e9..5f34a3a 100644
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ b/.idea/modules/simple-jdbc-stats_test.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -13,13 +13,11 @@
     <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-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple: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.193" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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" />

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </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
index 3b8dfae..dff0656 100644
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ b/.idea/modules/simple-jdbc-stats_main.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -10,11 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.193" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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
index 03d17e9..5f34a3a 100644
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ b/.idea/modules/simple-jdbc-stats_test.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -13,13 +13,11 @@
     <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-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple: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.193" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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" />
diff --git a/build.gradle b/build.gradle
index 7e6e7a6..200746b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,12 +25,15 @@
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile "org.slf4j:slf4j-simple:1.7.21"
+    testCompile "com.h2database:h2:1.4.+"
 
-    compile "nl.astraeus.template:very-simple-templates:1.+"
+    compile "nl.astraeus.template:very-simple-templates:1.3"
     compile "nl.astraeus.web:simple-web:0.2"
     compile "org.slf4j:slf4j-api:1.7.+"
-    compile "org.slf4j:slf4j-simple:1.7.+"
-    testCompile "com.h2database:h2:1.4.+"
+
+    configurations.compile.exclude module: 'javax.servlet-api'
+    configurations.compile.exclude module: 'slf4j-simple'
 }
 
 uploadArchives {
@@ -76,3 +79,11 @@
         }
     }
 }
+
+jar {
+    from {
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
+}

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </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
index 3b8dfae..dff0656 100644
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ b/.idea/modules/simple-jdbc-stats_main.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -10,11 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.193" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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
index 03d17e9..5f34a3a 100644
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ b/.idea/modules/simple-jdbc-stats_test.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -13,13 +13,11 @@
     <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-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple: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.193" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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" />
diff --git a/build.gradle b/build.gradle
index 7e6e7a6..200746b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,12 +25,15 @@
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile "org.slf4j:slf4j-simple:1.7.21"
+    testCompile "com.h2database:h2:1.4.+"
 
-    compile "nl.astraeus.template:very-simple-templates:1.+"
+    compile "nl.astraeus.template:very-simple-templates:1.3"
     compile "nl.astraeus.web:simple-web:0.2"
     compile "org.slf4j:slf4j-api:1.7.+"
-    compile "org.slf4j:slf4j-simple:1.7.+"
-    testCompile "com.h2database:h2:1.4.+"
+
+    configurations.compile.exclude module: 'javax.servlet-api'
+    configurations.compile.exclude module: 'slf4j-simple'
 }
 
 uploadArchives {
@@ -76,3 +79,11 @@
         }
     }
 }
+
+jar {
+    from {
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c48905..975ceaf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 17 14:30:47 CEST 2015
+#Fri Dec 09 09:24:26 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </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
index 3b8dfae..dff0656 100644
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ b/.idea/modules/simple-jdbc-stats_main.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -10,11 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.193" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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
index 03d17e9..5f34a3a 100644
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ b/.idea/modules/simple-jdbc-stats_test.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -13,13 +13,11 @@
     <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-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple: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.193" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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" />
diff --git a/build.gradle b/build.gradle
index 7e6e7a6..200746b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,12 +25,15 @@
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile "org.slf4j:slf4j-simple:1.7.21"
+    testCompile "com.h2database:h2:1.4.+"
 
-    compile "nl.astraeus.template:very-simple-templates:1.+"
+    compile "nl.astraeus.template:very-simple-templates:1.3"
     compile "nl.astraeus.web:simple-web:0.2"
     compile "org.slf4j:slf4j-api:1.7.+"
-    compile "org.slf4j:slf4j-simple:1.7.+"
-    testCompile "com.h2database:h2:1.4.+"
+
+    configurations.compile.exclude module: 'javax.servlet-api'
+    configurations.compile.exclude module: 'slf4j-simple'
 }
 
 uploadArchives {
@@ -76,3 +79,11 @@
         }
     }
 }
+
+jar {
+    from {
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c48905..975ceaf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 17 14:30:47 CEST 2015
+#Fri Dec 09 09:24:26 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
deleted file mode 100644
index f29bc33..0000000
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package nl.astraeus.jdbc.example;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * User: rnentjes
- * Date: 4/12/12
- * Time: 7:32 PM
- */
-public class JdbcStatisticsExample {
-
-
-    public static void main(String [] args) throws Exception {
-        Class.forName("org.h2.Driver");
-        Class.forName("nl.astraeus.jdbc.Driver");
-
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    new JdbcStatisticsExample(18080, "TEST1");
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }.start();
-
-        new JdbcStatisticsExample(18081, "TEST2");
-    }
-
-    public JdbcStatisticsExample(int port, String dbname) throws Exception {
-        // webServerConnections=1;numberOfQueries=2500;logStacktraces=true;formattedQueries=true
-        Connection conn = DriverManager.getConnection("jdbc:stat:webServerPort="+port+":jdbc:h2:mem:"+dbname, "user", "password");
-        conn.setAutoCommit(false);
-
-        Statement statement = null;
-
-        statement = conn.createStatement();
-        statement.execute("CREATE TABLE "+dbname+" (ID INT PRIMARY KEY, NAME VARCHAR(255))");
-        statement.close();
-
-        conn.commit();
-
-        boolean running = true;
-        int count = 1;
-        PreparedStatement ps = null;
-
-        while (running) {
-            String TableName = dbname+"_"+(System.nanoTime() % 1000);
-
-            try {
-                ps = conn.prepareStatement("SELECT COUNT(*) FROM "+TableName);
-                ResultSet rs = ps.executeQuery();
-            } catch (SQLException e) {
-                statement = conn.createStatement();
-                statement.execute("CREATE TABLE "+TableName+" (ID INT PRIMARY KEY, NAME VARCHAR(255))");
-                statement.close();
-            } finally {
-                if (ps!=null) {
-                    ps.close();
-                }
-            }
-
-            ps = conn.prepareStatement("INSERT INTO "+TableName+" VALUES (?, ?)");
-
-            ps.setInt(1, count++);
-            ps.setString(2, "String  "+System.currentTimeMillis());
-
-            ps.execute();
-            ps.close();
-
-            conn.commit();
-
-            Thread.sleep(10);
-
-            ps = conn.prepareStatement("SELECT * FROM "+TableName);
-            ResultSet rs = ps.executeQuery();
-
-            statement.close();
-
-            ps = conn.prepareStatement("UPDATE "+TableName+" SET NAME = ?");
-
-            ps.setString(1, "String  "+System.currentTimeMillis());
-
-            ps.execute();
-            ps.close();
-
-            conn.commit();
-
-            Thread.sleep(10);
-        }
-
-        conn.close();
-    }
-}

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 02bd6d2..5cbbdd6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
       <entry name="?*.xml" />
@@ -19,12 +17,9 @@
       <entry name="?*.png" />
       <entry name="?*.gif" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
+      <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" />
       <module name="simple_jdbc_stats_test" target="1.5" />
     </bytecodeTargetLevel>
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
deleted file mode 100644
index da14166..0000000
--- a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.h2database:h2:1.4.192">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/1106492605db135523d2817881cdf029d9292afa/h2-1.4.192.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/1.4.192/af6d933f4d5a49fc87e606296cd1bbc40e832374/h2-1.4.192-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index aa298b2..0000000
--- a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/3cd63d075497751784b2fa84be59432f4905bf7c/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/3.1.0/ab3976d4574c48d22dc1abf6a9e8bd0fdf928223/javax.servlet-api-3.1.0-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
new file mode 100644
index 0000000..04c10dd
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
new file mode 100644
index 0000000..9a00155
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3/e26b776421173ad117ca241775b9483f4de63223/very-simple-templates-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
deleted file mode 100644
index a93b4c0..0000000
--- a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/nl.astraeus.template/very-simple-templates/1.3-SNAPSHOT/656d4038ea2a4369e2ad60bd06973be7da05d3b2/very-simple-templates-1.3-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
deleted file mode 100644
index 1a91ac2..0000000
--- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.slf4j:slf4j-simple:1.7.21">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/be4b3c560a37e69b6c58278116740db28832232c/slf4j-simple-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-simple/1.7.21/58eb8609a8f14e5bbf4d260ce5f364724079227/slf4j-simple-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4c7383f..9398269 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +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" />
     </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 ef72cfd..be4bd00 100644
--- a/.idea/modules/simple-jdbc-stats.iml
+++ b/.idea/modules/simple-jdbc-stats.iml
@@ -1,28 +1,12 @@
 <?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.jdbc" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<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.jdbc" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.web:simple-web:0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </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
index 3b8dfae..dff0656 100644
--- a/.idea/modules/simple-jdbc-stats_main.iml
+++ b/.idea/modules/simple-jdbc-stats_main.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -10,11 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.193" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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
index 03d17e9..5f34a3a 100644
--- a/.idea/modules/simple-jdbc-stats_test.iml
+++ b/.idea/modules/simple-jdbc-stats_test.iml
@@ -1,5 +1,5 @@
 <?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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.4-SNAPSHOT" type="JAVA_MODULE" version="4">
+<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.jdbc" external.system.module.type="sourceSet" external.system.module.version="1.5.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -13,13 +13,11 @@
     <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-SNAPSHOT" level="project" />
+    <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.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple: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.193" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" 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" />
diff --git a/build.gradle b/build.gradle
index 7e6e7a6..200746b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,12 +25,15 @@
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile "org.slf4j:slf4j-simple:1.7.21"
+    testCompile "com.h2database:h2:1.4.+"
 
-    compile "nl.astraeus.template:very-simple-templates:1.+"
+    compile "nl.astraeus.template:very-simple-templates:1.3"
     compile "nl.astraeus.web:simple-web:0.2"
     compile "org.slf4j:slf4j-api:1.7.+"
-    compile "org.slf4j:slf4j-simple:1.7.+"
-    testCompile "com.h2database:h2:1.4.+"
+
+    configurations.compile.exclude module: 'javax.servlet-api'
+    configurations.compile.exclude module: 'slf4j-simple'
 }
 
 uploadArchives {
@@ -76,3 +79,11 @@
         }
     }
 }
+
+jar {
+    from {
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c48905..975ceaf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 17 14:30:47 CEST 2015
+#Fri Dec 09 09:24:26 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
deleted file mode 100644
index f29bc33..0000000
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package nl.astraeus.jdbc.example;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * User: rnentjes
- * Date: 4/12/12
- * Time: 7:32 PM
- */
-public class JdbcStatisticsExample {
-
-
-    public static void main(String [] args) throws Exception {
-        Class.forName("org.h2.Driver");
-        Class.forName("nl.astraeus.jdbc.Driver");
-
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    new JdbcStatisticsExample(18080, "TEST1");
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }.start();
-
-        new JdbcStatisticsExample(18081, "TEST2");
-    }
-
-    public JdbcStatisticsExample(int port, String dbname) throws Exception {
-        // webServerConnections=1;numberOfQueries=2500;logStacktraces=true;formattedQueries=true
-        Connection conn = DriverManager.getConnection("jdbc:stat:webServerPort="+port+":jdbc:h2:mem:"+dbname, "user", "password");
-        conn.setAutoCommit(false);
-
-        Statement statement = null;
-
-        statement = conn.createStatement();
-        statement.execute("CREATE TABLE "+dbname+" (ID INT PRIMARY KEY, NAME VARCHAR(255))");
-        statement.close();
-
-        conn.commit();
-
-        boolean running = true;
-        int count = 1;
-        PreparedStatement ps = null;
-
-        while (running) {
-            String TableName = dbname+"_"+(System.nanoTime() % 1000);
-
-            try {
-                ps = conn.prepareStatement("SELECT COUNT(*) FROM "+TableName);
-                ResultSet rs = ps.executeQuery();
-            } catch (SQLException e) {
-                statement = conn.createStatement();
-                statement.execute("CREATE TABLE "+TableName+" (ID INT PRIMARY KEY, NAME VARCHAR(255))");
-                statement.close();
-            } finally {
-                if (ps!=null) {
-                    ps.close();
-                }
-            }
-
-            ps = conn.prepareStatement("INSERT INTO "+TableName+" VALUES (?, ?)");
-
-            ps.setInt(1, count++);
-            ps.setString(2, "String  "+System.currentTimeMillis());
-
-            ps.execute();
-            ps.close();
-
-            conn.commit();
-
-            Thread.sleep(10);
-
-            ps = conn.prepareStatement("SELECT * FROM "+TableName);
-            ResultSet rs = ps.executeQuery();
-
-            statement.close();
-
-            ps = conn.prepareStatement("UPDATE "+TableName+" SET NAME = ?");
-
-            ps.setString(1, "String  "+System.currentTimeMillis());
-
-            ps.execute();
-            ps.close();
-
-            conn.commit();
-
-            Thread.sleep(10);
-        }
-
-        conn.close();
-    }
-}
diff --git a/test/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/test/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
new file mode 100644
index 0000000..f29bc33
--- /dev/null
+++ b/test/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -0,0 +1,100 @@
+package nl.astraeus.jdbc.example;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * User: rnentjes
+ * Date: 4/12/12
+ * Time: 7:32 PM
+ */
+public class JdbcStatisticsExample {
+
+
+    public static void main(String [] args) throws Exception {
+        Class.forName("org.h2.Driver");
+        Class.forName("nl.astraeus.jdbc.Driver");
+
+        new Thread() {
+            @Override
+            public void run() {
+                try {
+                    new JdbcStatisticsExample(18080, "TEST1");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }.start();
+
+        new JdbcStatisticsExample(18081, "TEST2");
+    }
+
+    public JdbcStatisticsExample(int port, String dbname) throws Exception {
+        // webServerConnections=1;numberOfQueries=2500;logStacktraces=true;formattedQueries=true
+        Connection conn = DriverManager.getConnection("jdbc:stat:webServerPort="+port+":jdbc:h2:mem:"+dbname, "user", "password");
+        conn.setAutoCommit(false);
+
+        Statement statement = null;
+
+        statement = conn.createStatement();
+        statement.execute("CREATE TABLE "+dbname+" (ID INT PRIMARY KEY, NAME VARCHAR(255))");
+        statement.close();
+
+        conn.commit();
+
+        boolean running = true;
+        int count = 1;
+        PreparedStatement ps = null;
+
+        while (running) {
+            String TableName = dbname+"_"+(System.nanoTime() % 1000);
+
+            try {
+                ps = conn.prepareStatement("SELECT COUNT(*) FROM "+TableName);
+                ResultSet rs = ps.executeQuery();
+            } catch (SQLException e) {
+                statement = conn.createStatement();
+                statement.execute("CREATE TABLE "+TableName+" (ID INT PRIMARY KEY, NAME VARCHAR(255))");
+                statement.close();
+            } finally {
+                if (ps!=null) {
+                    ps.close();
+                }
+            }
+
+            ps = conn.prepareStatement("INSERT INTO "+TableName+" VALUES (?, ?)");
+
+            ps.setInt(1, count++);
+            ps.setString(2, "String  "+System.currentTimeMillis());
+
+            ps.execute();
+            ps.close();
+
+            conn.commit();
+
+            Thread.sleep(10);
+
+            ps = conn.prepareStatement("SELECT * FROM "+TableName);
+            ResultSet rs = ps.executeQuery();
+
+            statement.close();
+
+            ps = conn.prepareStatement("UPDATE "+TableName+" SET NAME = ?");
+
+            ps.setString(1, "String  "+System.currentTimeMillis());
+
+            ps.execute();
+            ps.close();
+
+            conn.commit();
+
+            Thread.sleep(10);
+        }
+
+        conn.close();
+    }
+}