diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/build/pmd/saxon-9.1.0.8-dom.jar b/lib/build/pmd/saxon-9.1.0.8-dom.jar
new file mode 100644
index 0000000..6ded01e
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8-dom.jar
Binary files differ

diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/build/pmd/saxon-9.1.0.8-dom.jar b/lib/build/pmd/saxon-9.1.0.8-dom.jar
new file mode 100644
index 0000000..6ded01e
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8-dom.jar
Binary files differ
diff --git a/lib/build/pmd/saxon-9.1.0.8.jar b/lib/build/pmd/saxon-9.1.0.8.jar
new file mode 100644
index 0000000..de236e5
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8.jar
Binary files differ

diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/build/pmd/saxon-9.1.0.8-dom.jar b/lib/build/pmd/saxon-9.1.0.8-dom.jar
new file mode 100644
index 0000000..6ded01e
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8-dom.jar
Binary files differ
diff --git a/lib/build/pmd/saxon-9.1.0.8.jar b/lib/build/pmd/saxon-9.1.0.8.jar
new file mode 100644
index 0000000..de236e5
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8.jar
Binary files differ
diff --git a/lib/build/pmd/xercesImpl-2.9.1.jar b/lib/build/pmd/xercesImpl-2.9.1.jar
new file mode 100644
index 0000000..547f563
--- /dev/null
+++ b/lib/build/pmd/xercesImpl-2.9.1.jar
Binary files differ

diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/build/pmd/saxon-9.1.0.8-dom.jar b/lib/build/pmd/saxon-9.1.0.8-dom.jar
new file mode 100644
index 0000000..6ded01e
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8-dom.jar
Binary files differ
diff --git a/lib/build/pmd/saxon-9.1.0.8.jar b/lib/build/pmd/saxon-9.1.0.8.jar
new file mode 100644
index 0000000..de236e5
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8.jar
Binary files differ
diff --git a/lib/build/pmd/xercesImpl-2.9.1.jar b/lib/build/pmd/xercesImpl-2.9.1.jar
new file mode 100644
index 0000000..547f563
--- /dev/null
+++ b/lib/build/pmd/xercesImpl-2.9.1.jar
Binary files differ
diff --git a/lib/build/pmd/xml-apis-1.3.02.jar b/lib/build/pmd/xml-apis-1.3.02.jar
new file mode 100644
index 0000000..243eaea
--- /dev/null
+++ b/lib/build/pmd/xml-apis-1.3.02.jar
Binary files differ

diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/build/pmd/saxon-9.1.0.8-dom.jar b/lib/build/pmd/saxon-9.1.0.8-dom.jar
new file mode 100644
index 0000000..6ded01e
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8-dom.jar
Binary files differ
diff --git a/lib/build/pmd/saxon-9.1.0.8.jar b/lib/build/pmd/saxon-9.1.0.8.jar
new file mode 100644
index 0000000..de236e5
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8.jar
Binary files differ
diff --git a/lib/build/pmd/xercesImpl-2.9.1.jar b/lib/build/pmd/xercesImpl-2.9.1.jar
new file mode 100644
index 0000000..547f563
--- /dev/null
+++ b/lib/build/pmd/xercesImpl-2.9.1.jar
Binary files differ
diff --git a/lib/build/pmd/xml-apis-1.3.02.jar b/lib/build/pmd/xml-apis-1.3.02.jar
new file mode 100644
index 0000000..243eaea
--- /dev/null
+++ b/lib/build/pmd/xml-apis-1.3.02.jar
Binary files differ
diff --git a/lib/build/pmd/xmlParserAPIs-2.6.2.jar b/lib/build/pmd/xmlParserAPIs-2.6.2.jar
new file mode 100644
index 0000000..2dd8377
--- /dev/null
+++ b/lib/build/pmd/xmlParserAPIs-2.6.2.jar
Binary files differ

diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml
index 3a2cdf7..cdaf7bd 100644
--- a/SimpleDatabase.iml
+++ b/SimpleDatabase.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -28,6 +28,6 @@
         <jarDirectory url="file://$MODULE_DIR$/lib/build/junit" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/build/pmd/saxon-9.1.0.8-dom.jar b/lib/build/pmd/saxon-9.1.0.8-dom.jar
new file mode 100644
index 0000000..6ded01e
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8-dom.jar
Binary files differ
diff --git a/lib/build/pmd/saxon-9.1.0.8.jar b/lib/build/pmd/saxon-9.1.0.8.jar
new file mode 100644
index 0000000..de236e5
--- /dev/null
+++ b/lib/build/pmd/saxon-9.1.0.8.jar
Binary files differ
diff --git a/lib/build/pmd/xercesImpl-2.9.1.jar b/lib/build/pmd/xercesImpl-2.9.1.jar
new file mode 100644
index 0000000..547f563
--- /dev/null
+++ b/lib/build/pmd/xercesImpl-2.9.1.jar
Binary files differ
diff --git a/lib/build/pmd/xml-apis-1.3.02.jar b/lib/build/pmd/xml-apis-1.3.02.jar
new file mode 100644
index 0000000..243eaea
--- /dev/null
+++ b/lib/build/pmd/xml-apis-1.3.02.jar
Binary files differ
diff --git a/lib/build/pmd/xmlParserAPIs-2.6.2.jar b/lib/build/pmd/xmlParserAPIs-2.6.2.jar
new file mode 100644
index 0000000..2dd8377
--- /dev/null
+++ b/lib/build/pmd/xmlParserAPIs-2.6.2.jar
Binary files differ
diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java
index 78ab37a..700c3e4 100644
--- a/src/nl/astraeus/database/FieldMetaData.java
+++ b/src/nl/astraeus/database/FieldMetaData.java
@@ -1,20 +1,38 @@
 package nl.astraeus.database;
 
-import nl.astraeus.database.annotations.Blob;
-import nl.astraeus.database.annotations.*;
-import nl.astraeus.template.SimpleTemplate;
-import nl.astraeus.util.Util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
+import nl.astraeus.database.annotations.Blob;
+import nl.astraeus.database.annotations.Collection;
+import nl.astraeus.database.annotations.Column;
+import nl.astraeus.database.annotations.Default;
+import nl.astraeus.database.annotations.Id;
+import nl.astraeus.database.annotations.Index;
+import nl.astraeus.database.annotations.Length;
+import nl.astraeus.database.annotations.Reference;
+import nl.astraeus.database.annotations.Serialized;
+import nl.astraeus.database.annotations.Table;
+import nl.astraeus.template.SimpleTemplate;
+import nl.astraeus.util.Util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Date: 11/14/13
  * Time: 8:59 PM
@@ -22,7 +40,7 @@
 public class FieldMetaData {
     private final static Logger logger = LoggerFactory.getLogger(FieldMetaData.class);
 
-    public static enum ColumnType {
+    public enum ColumnType {
         BASIC,
         COLLECTION,
         SERIALIZED,