diff --git a/examples/gradle/build.gradle b/examples/gradle/build.gradle
index f2a03dcc..61b37e33 100644
--- a/examples/gradle/build.gradle
+++ b/examples/gradle/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '5.7.0'
+                  version: '5.8.0'
 
         classpath "com.oracle:ojdbc6:11.1.0.7"
 
diff --git a/examples/gradle_domain_extension/build.gradle b/examples/gradle_domain_extension/build.gradle
index ed1ba416..213f7ea9 100644
--- a/examples/gradle_domain_extension/build.gradle
+++ b/examples/gradle_domain_extension/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-domainextension-gradle-plugin',
-                  version: '5.7.0'
+                  version: '5.8.0'
 
         classpath "com.oracle:ojdbc6:11.1.0.7"
 
diff --git a/examples/gradle_encoding/build.gradle b/examples/gradle_encoding/build.gradle
index ae84631f..cc11a4d8 100644
--- a/examples/gradle_encoding/build.gradle
+++ b/examples/gradle_encoding/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '5.7.0'
+                  version: '5.8.0'
 
         classpath "com.oracle:ojdbc6:11.1.0.7"
 
diff --git a/examples/hsqldb/build.gradle b/examples/hsqldb/build.gradle
index c8e76f57..050117d8 100644
--- a/examples/hsqldb/build.gradle
+++ b/examples/hsqldb/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '5.7.0'
+                  version: '5.8.0'
 
         classpath group: 'org.hsqldb', name: 'hsqldb', version: '2.4.0'
 
diff --git a/examples/mariadb/build.gradle b/examples/mariadb/build.gradle
index 47e733ea..272ac332 100644
--- a/examples/mariadb/build.gradle
+++ b/examples/mariadb/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '5.7.0'
+                  version: '5.8.0'
         classpath group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '1.1.7'
     }
 }
diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml
index 303a7052..c57c09aa 100644
--- a/examples/maven/pom.xml
+++ b/examples/maven/pom.xml
@@ -16,7 +16,7 @@
       <plugin>
         <groupId>com.opitzconsulting.orcas</groupId>
         <artifactId>orcas-maven-plugin</artifactId>
-        <version>5.7.0</version>
+        <version>5.8.0</version>
         <extensions>true</extensions>
 
         <dependencies>
diff --git a/examples/maven_domain_extension/pom.xml b/examples/maven_domain_extension/pom.xml
index 4b31388a..a2cea0cc 100644
--- a/examples/maven_domain_extension/pom.xml
+++ b/examples/maven_domain_extension/pom.xml
@@ -13,14 +13,14 @@
       <plugin>
         <groupId>com.opitzconsulting.orcas</groupId>
         <artifactId>orcas-maven-plugin</artifactId>
-        <version>5.7.0</version>
+        <version>5.8.0</version>
         <extensions>true</extensions>
 
         <dependencies>
           <dependency>
             <groupId>com.opitzconsulting.orcas</groupId>
             <artifactId>orcas-domainextension-main-extensionhandler</artifactId>
-            <version>5.7.0</version>
+            <version>5.8.0</version>
           </dependency>
 
 		<dependency>
diff --git a/examples/maven_extension_demo/pom.xml b/examples/maven_extension_demo/pom.xml
index 4043944c..232cb490 100644
--- a/examples/maven_extension_demo/pom.xml
+++ b/examples/maven_extension_demo/pom.xml
@@ -16,7 +16,7 @@
       <plugin>
         <groupId>com.opitzconsulting.orcas</groupId>
         <artifactId>orcas-maven-plugin</artifactId>
-        <version>5.7.0</version>
+        <version>5.8.0</version>
         <extensions>true</extensions>
 
  
diff --git a/examples/orderentry/db/build.xml b/examples/orderentry/db/build.xml
index c2117593..ef10834f 100644
--- a/examples/orderentry/db/build.xml
+++ b/examples/orderentry/db/build.xml
@@ -18,7 +18,7 @@
   </target>
 
   <target name="orcas_initialize" depends="show_location">
-    <orcas_initialize orcasprebuildversion="com.opitzconsulting.orcas:orcas-main:5.7.0"/>
+    <orcas_initialize orcasprebuildversion="com.opitzconsulting.orcas:orcas-main:5.8.0"/>
   </target>
 
   <target name="build_tables" depends="show_location,orcas_initialize">
diff --git a/orcas_core/build_source/build.gradle b/orcas_core/build_source/build.gradle
index 5e7b78e5..ea140e31 100644
--- a/orcas_core/build_source/build.gradle
+++ b/orcas_core/build_source/build.gradle
@@ -3,7 +3,7 @@ subprojects
   project.ext.xtext_version = "2.6.1"
 
   project.group = "com.opitzconsulting.orcas"
-  project.version = "5.7.1-SNAPSHOT"  
+  project.version = "5.8.0"  
 
   repositories 
   {
diff --git a/orcas_core/release_orcas_step1.sh b/orcas_core/release_orcas_step1.sh
index 74dc11ba..cd44815b 100644
--- a/orcas_core/release_orcas_step1.sh
+++ b/orcas_core/release_orcas_step1.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-new_orcas_version=5.7.0
+new_orcas_version=5.8.0
 
 cd ..
 
diff --git a/orcas_core/release_orcas_step2.sh b/orcas_core/release_orcas_step2.sh
index 13b6f50c..20803e06 100644
--- a/orcas_core/release_orcas_step2.sh
+++ b/orcas_core/release_orcas_step2.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-new_orcas_snapshot_version=5.7.1-SNAPSHOT
+new_orcas_snapshot_version=5.8.1-SNAPSHOT
 
 cd ..
 
diff --git a/orcas_core/upload_maven_central/build.gradle b/orcas_core/upload_maven_central/build.gradle
index 7d3f6b08..ba4f774b 100644
--- a/orcas_core/upload_maven_central/build.gradle
+++ b/orcas_core/upload_maven_central/build.gradle
@@ -3,7 +3,7 @@ project.buildDir = ".gradle/build"
 apply from: 'mcupload.gradle'
 
 project.group = "com.opitzconsulting.orcas"
-project.version = "5.7.0"  
+project.version = "5.8.0"  
 
 project.ext.mcupload.publish("orcas-db-objects")
 project.ext.mcupload.publish("orcas-orig")
diff --git a/orcas_integrationstest/build.gradle b/orcas_integrationstest/build.gradle
index a11b0549..9c8d02eb 100644
--- a/orcas_integrationstest/build.gradle
+++ b/orcas_integrationstest/build.gradle
@@ -9,7 +9,7 @@ dependencies
 {
   compile 'junit:junit:4.12'
   compile group: 'com.opitzconsulting.orcas', name: 'orcas-main-extensionhandler',
-                  version: '5.7.0'
+                  version: '5.8.0'
 
   compile "com.oracle:ojdbc6:11.1.0.7"
 
diff --git a/orcas_maven_plugin/pom.xml b/orcas_maven_plugin/pom.xml
index 17ae7185..a6ca3e72 100644
--- a/orcas_maven_plugin/pom.xml
+++ b/orcas_maven_plugin/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.opitzconsulting.orcas</groupId>
 	<artifactId>orcas-maven-plugin</artifactId>
-	<version>5.7.1-SNAPSHOT</version>
+	<version>5.8.0</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>com.opitzconsulting.orcas:orcas-maven-plugin</name>
@@ -43,17 +43,17 @@
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-main</artifactId>
-			<version>5.7.1-SNAPSHOT</version>
+			<version>5.8.0</version>
    		</dependency>
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-main-extensionhandler</artifactId>
-			<version>5.7.1-SNAPSHOT</version>
+			<version>5.8.0</version>
    		</dependency>
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-db-objects</artifactId>
-			<version>5.7.1-SNAPSHOT</version>
+			<version>5.8.0</version>
 		</dependency>
 
 		<dependency>