diff --git a/examples/gradle_custom_build/build.gradle b/examples/gradle_custom_build/build.gradle
index 1aed7d5b..d17ee402 100644
--- a/examples/gradle_custom_build/build.gradle
+++ b/examples/gradle_custom_build/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
     }
diff --git a/examples/gradle_domain_extension/build.gradle b/examples/gradle_domain_extension/build.gradle
index 931f0fb2..5f6cdc1f 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: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
     }
diff --git a/examples/gradle_encoding/build.gradle b/examples/gradle_encoding/build.gradle
index 2f34fb80..2a85cbb8 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: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
     }
diff --git a/examples/gradle_hsqldb/build.gradle b/examples/gradle_hsqldb/build.gradle
index db80e5b7..ca9f62d7 100644
--- a/examples/gradle_hsqldb/build.gradle
+++ b/examples/gradle_hsqldb/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'org.hsqldb', name: 'hsqldb', version: '2.4.0'
 
diff --git a/examples/gradle_mariadb/build.gradle b/examples/gradle_mariadb/build.gradle
index 95c546ad..6c317145 100644
--- a/examples/gradle_mariadb/build.gradle
+++ b/examples/gradle_mariadb/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '8.3.1'
+                  version: '8.4.0'
         classpath group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '1.1.7'
     }
 }
diff --git a/examples/gradle_multi_schema/build.gradle b/examples/gradle_multi_schema/build.gradle
index c9d67d2e..cda80828 100644
--- a/examples/gradle_multi_schema/build.gradle
+++ b/examples/gradle_multi_schema/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
     }
diff --git a/examples/gradle_postgres/build.gradle b/examples/gradle_postgres/build.gradle
index 194198ab..73c0dfe0 100644
--- a/examples/gradle_postgres/build.gradle
+++ b/examples/gradle_postgres/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'org.postgresql', name: 'postgresql', version: '42.2.9'
     }
diff --git a/examples/gradle_simple/build.gradle b/examples/gradle_simple/build.gradle
index 92ee516e..be5a12b9 100644
--- a/examples/gradle_simple/build.gradle
+++ b/examples/gradle_simple/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin',
-                  version: '8.3.1'
+                  version: '8.4.0'
 
         classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
     }
diff --git a/examples/maven_domain_extension/pom.xml b/examples/maven_domain_extension/pom.xml
index 0e76e45a..879eab93 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>8.3.1</version>
+        <version>8.4.0</version>
         <extensions>true</extensions>
 
         <dependencies>
           <dependency>
             <groupId>com.opitzconsulting.orcas</groupId>
             <artifactId>orcas-domainextension-main-extensionhandler</artifactId>
-            <version>8.3.1</version>
+            <version>8.4.0</version>
           </dependency>
 
 		<dependency>
diff --git a/examples/maven_extension_demo/pom.xml b/examples/maven_extension_demo/pom.xml
index 9a729eda..89bad77d 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>8.3.1</version>
+        <version>8.4.0</version>
         <extensions>true</extensions>
 
  
diff --git a/examples/maven_simple/pom.xml b/examples/maven_simple/pom.xml
index 772cbd31..6ed9125e 100644
--- a/examples/maven_simple/pom.xml
+++ b/examples/maven_simple/pom.xml
@@ -16,7 +16,7 @@
       <plugin>
         <groupId>com.opitzconsulting.orcas</groupId>
         <artifactId>orcas-maven-plugin</artifactId>
-        <version>8.3.1</version>
+        <version>8.4.0</version>
         <extensions>true</extensions>
 
         <dependencies>
diff --git a/orcas_core/build_source/build.gradle b/orcas_core/build_source/build.gradle
index 12b67a62..bb5800f4 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 = "8.3.2-SNAPSHOT"  
+  project.version = "8.4.0"  
 
   repositories 
   {
diff --git a/orcas_core/release_orcas_step1.sh b/orcas_core/release_orcas_step1.sh
index f539854d..b478ffaf 100644
--- a/orcas_core/release_orcas_step1.sh
+++ b/orcas_core/release_orcas_step1.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-new_orcas_version=8.3.1
+new_orcas_version=8.4.0
 
 cd ..
 
diff --git a/orcas_core/release_orcas_step2.sh b/orcas_core/release_orcas_step2.sh
index edc31b89..b3bfee80 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=8.3.2-SNAPSHOT
+new_orcas_snapshot_version=8.4.1-SNAPSHOT
 
 cd ..
 
diff --git a/orcas_core/upload_maven_central/build.gradle b/orcas_core/upload_maven_central/build.gradle
index 28cfb47a..65e2667c 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 = "8.3.1"  
+project.version = "8.4.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 209966af..31e146dc 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: '8.3.1'
+                  version: '8.4.0'
 
   compile group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
   compile "com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre8"
diff --git a/orcas_maven_plugin/pom.xml b/orcas_maven_plugin/pom.xml
index c6e7e9b1..eaa55d86 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>8.3.2-SNAPSHOT</version>
+	<version>8.4.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>8.3.2-SNAPSHOT</version>
+			<version>8.4.0</version>
    		</dependency>
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-main-extensionhandler</artifactId>
-			<version>8.3.2-SNAPSHOT</version>
+			<version>8.4.0</version>
    		</dependency>
 		<dependency>
 			<groupId>com.opitzconsulting.orcas</groupId>
 			<artifactId>orcas-db-objects</artifactId>
-			<version>8.3.2-SNAPSHOT</version>
+			<version>8.4.0</version>
 		</dependency>
 
 		<dependency>