diff --git a/examples/gradle/build.gradle b/examples/gradle/build.gradle
index 0d3bdf2e..889d125b 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: '3.0.0'
+                  version: '3.1.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 4e08e25d..f4a5974b 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: '3.0.0'
+                  version: '3.1.0'
 
         classpath "com.oracle:ojdbc6:11.1.0.7"
 
diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml
index ec234b7e..523613bd 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>3.0.0</version>
+        <version>3.1.0</version>
         <extensions>true</extensions>
 
         <dependencies>
diff --git a/examples/maven_domain_extension/pom.xml b/examples/maven_domain_extension/pom.xml
index 63fe6553..4b203fab 100644
--- a/examples/maven_domain_extension/pom.xml
+++ b/examples/maven_domain_extension/pom.xml
@@ -16,7 +16,7 @@
       <plugin>
         <groupId>com.opitzconsulting.orcas</groupId>
         <artifactId>orcas-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <extensions>true</extensions>
 
  
diff --git a/examples/maven_extension_demo/pom.xml b/examples/maven_extension_demo/pom.xml
index e4878104..6d9d0588 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>3.0.0</version>
+        <version>3.1.0</version>
         <extensions>true</extensions>
 
  
diff --git a/examples/orderentry/db/build.xml b/examples/orderentry/db/build.xml
index 7d8d9453..b5e20686 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:3.0.0"/>
+    <orcas_initialize orcasprebuildversion="com.opitzconsulting.orcas:orcas-main:3.1.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 96feffd9..5df74843 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.5.1"
 
   project.group = "com.opitzconsulting.orcas"
-  project.version = "3.0.1-SNAPSHOT"  
+  project.version = "3.1.0"  
 
   repositories 
   {
diff --git a/orcas_core/upload_maven_central/build.gradle b/orcas_core/upload_maven_central/build.gradle
index c3de1f18..82748f26 100644
--- a/orcas_core/upload_maven_central/build.gradle
+++ b/orcas_core/upload_maven_central/build.gradle
@@ -3,31 +3,33 @@ project.buildDir = ".gradle/build"
 apply from: 'mcupload.gradle'
 
 project.group = "com.opitzconsulting.orcas"
-project.version = "3.0.0"  
+project.version = "3.1.0"  
 
 project.ext.mcupload.publish("orcas-db-objects")
 project.ext.mcupload.publish("orcas-orig")
+project.ext.mcupload.publish("orcas-main")
+project.ext.mcupload.publish("orcas-generated")
 
 project.ext.mcupload.publish("orcas-maven-plugin")
 
 project.ext.mcupload.publish("orcas-extenions")
-project.ext.mcupload.publish("orcas-generated")
 project.ext.mcupload.publish("orcas-gradle-plugin")
-project.ext.mcupload.publish("orcas-main")
+project.ext.mcupload.publish("orcas-main-extensionhandler")
+project.ext.mcupload.publish("orcas-generated-syex")
 project.ext.mcupload.publish("orcas-syex")
 project.ext.mcupload.publish("orcas-xslt-extract")
 
 project.ext.mcupload.publish("orcas-domainextension-extenions")
-project.ext.mcupload.publish("orcas-domainextension-generated")
+project.ext.mcupload.publish("orcas-domainextension-generated-syex")
 project.ext.mcupload.publish("orcas-domainextension-gradle-plugin")
-project.ext.mcupload.publish("orcas-domainextension-main")
+project.ext.mcupload.publish("orcas-domainextension-main-extensionhandler")
 project.ext.mcupload.publish("orcas-domainextension-syex")
 project.ext.mcupload.publish("orcas-domainextension-xslt-extract")
 
 project.ext.mcupload.publish("orcas-domainextension-plsql-extenions")
-project.ext.mcupload.publish("orcas-domainextension-plsql-generated")
+project.ext.mcupload.publish("orcas-domainextension-plsql-generated-syex")
 project.ext.mcupload.publish("orcas-domainextension-plsql-gradle-plugin")
-project.ext.mcupload.publish("orcas-domainextension-plsql-main")
+project.ext.mcupload.publish("orcas-domainextension-plsql-main-extensionhandler")
 project.ext.mcupload.publish("orcas-domainextension-plsql-syex")
 project.ext.mcupload.publish("orcas-domainextension-plsql-xslt-extract")
 
diff --git a/orcas_maven_plugin/pom.xml b/orcas_maven_plugin/pom.xml
index c54d1e54..df935cf6 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>3.0.1-SNAPSHOT</version>
+	<version>3.1.0</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>com.opitzconsulting.orcas:orcas-maven-plugin</name>
@@ -40,15 +40,20 @@
 			<artifactId>maven-plugin-api</artifactId>
 			<version>3.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.opitzconsulting.orcas</groupId>
+			<artifactId>orcas-main</artifactId>
+			<version>3.1.0</version>
+   		</dependency>
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-main-extensionhandler</artifactId>
-			<version>3.0.1-SNAPSHOT</version>
+			<version>3.1.0</version>
    		</dependency>
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-db-objects</artifactId>
-			<version>3.0.1-SNAPSHOT</version>
+			<version>3.1.0</version>
 		</dependency>
 
 		<dependency>