diff --git a/pom.xml b/pom.xml
index e07ce17..084b90f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,21 +2,21 @@
 	<parent>
 		<groupId>net.anotheria</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.13</version>
+		<version>4.0</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>configureme</artifactId>
 	<name>ConfigureMe</name>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>4.0.1-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/org/configureme/annotations/ConfigureAlso.java b/src/main/java/org/configureme/annotations/ConfigureAlso.java
index 987a180..d5429ec 100644
--- a/src/main/java/org/configureme/annotations/ConfigureAlso.java
+++ b/src/main/java/org/configureme/annotations/ConfigureAlso.java
@@ -9,7 +9,6 @@
  * Mark config as External config
  *
  * @author ivanbatura
- * @since: 26.09.12
  * @version $Id: $Id
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/configureme/environments/DynamicEnvironment.java b/src/main/java/org/configureme/environments/DynamicEnvironment.java
index e5d28bf..ccbdd0f 100644
--- a/src/main/java/org/configureme/environments/DynamicEnvironment.java
+++ b/src/main/java/org/configureme/environments/DynamicEnvironment.java
@@ -8,7 +8,7 @@
 import java.util.Collection;
 
 /**
- * A dynamic environment class. This class can be used for any type of environments, for any environment deepth. However, we recommend the usage of more strict Application/LocaleBased Environment if
+ * A dynamic environment class. This class can be used for any type of environments, for any environment depth. However, we recommend the usage of more strict Application/LocaleBased Environment if
  * applicable, since they allow less and can prevent you from absolute environmental chaos. The DynamicEnvironment is the ultima ratio, a class that is capable of everything, but
  * requires not testable discipline of the developers.
  *
diff --git a/src/main/java/org/configureme/parser/IncludeParsedAttribute.java b/src/main/java/org/configureme/parser/IncludeParsedAttribute.java
index 6bce191..ad240e4 100644
--- a/src/main/java/org/configureme/parser/IncludeParsedAttribute.java
+++ b/src/main/java/org/configureme/parser/IncludeParsedAttribute.java
@@ -9,7 +9,6 @@
  * Include attribute contains link attribute in the another config.
  *
  * @author ivanbatura
- * @since: 26.09.12
  * @version $Id: $Id
  */
 public class IncludeParsedAttribute extends ParsedAttribute<IncludeValue> {
diff --git a/src/main/java/org/configureme/repository/IncludeValue.java b/src/main/java/org/configureme/repository/IncludeValue.java
index b190177..50068d1 100644
--- a/src/main/java/org/configureme/repository/IncludeValue.java
+++ b/src/main/java/org/configureme/repository/IncludeValue.java
@@ -7,7 +7,6 @@
 /**
  * Value of a include attribute. Link to the another config with a configurable attribute name.
  *
- * @since: 26.09.12
  * @version $Id: $Id
  */
 public class IncludeValue implements Value {
diff --git a/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java b/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java
index 2d67df4..dc6cf6a 100644
--- a/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java
+++ b/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java
@@ -12,7 +12,6 @@
  * with requested information.
  *
  * @author lrosenberg
- * @since 13.02.13 15:26
  * @version $Id: $Id
  */
 @XmlRootElement(name = "reply")