Merge branch 'release/2.4' of git://git.eclipse.org/gitroot/rcptt/org.eclipse.rcptt
diff --git a/Jenkinsfile b/Jenkinsfile
index 95f1244..e45113b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@
     stage('Launch agent') {
       agent {
         kubernetes {
-          label 'rcptt-gerrit-build-agent'
+          label 'rcptt-build-agent'
           yaml "${env.YAML_BUILD_AGENT}"
         }
       }
diff --git a/build.sh b/build.sh
index 706eebf..2f3b573 100755
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,7 @@
 # Contributors:
 # 	Xored Software Inc - initial API and implementation and/or initial documentation
 #*******************************************************************************
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:MaxMetaspaceSize=256m -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:MaxMetaspaceSize=256m"
 
 OPTIONS="-Dtycho.localArtifacts=ignore $@"
 
diff --git a/clean-pom.xml b/clean-pom.xml
index 0c37b6b..535eb9d 100644
--- a/clean-pom.xml
+++ b/clean-pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.xored.q7</groupId>
   <artifactId>q7.clean</artifactId>
-  <version>2.4.4-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF
index 2246fce..ea90be6 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.capability;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ctx.internal.capability
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.capability.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml
index 4c7c169..9aecc65 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.capability</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF
index 672abf9..0aa9839 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Debug
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.debug;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.debug,
  org.eclipse.rcptt.debug.impl,
diff --git a/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml
index d9bad62..7bd86b7 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.debug</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF
index 1cd968d..2935f00 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Context Extensions
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.extensions;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.extensions.ContextExtensionsPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.extensions
diff --git a/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml
index 8702126..5ed772e 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.extensions</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF
index 371407a..ce3e9df 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.filesystem;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,10 +13,10 @@
  org.eclipse.rcptt.filesystem.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.filesystem.FilesystemContextPlugin
diff --git a/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml
index 0bded10..a419470 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.filesystem</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF
index 1150c92..b1b3e6a 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.group;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@
  org.eclipse.rcptt.ctx.internal.group
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.group.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml
index cc80481..99d6839 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.group</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF
index aa2137f..0253cbc 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.parameters;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.parameters.internal,
  org.eclipse.rcptt.parameters,
diff --git a/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml
index 3954dd0..3ff0c37 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.parameters</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF
index 25f579c..64572ef 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.preferences.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.core.resources;resolution:=optional,
  org.eclipse.core.variables;resolution:=optional,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml
index 8f3ba50..a231cbc 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF
index 7e6999d..9c34dc5 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.resources;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@
 Export-Package: org.eclipse.rcptt.ctx.resources
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.resources.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml
index 9214e38..cde597a 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF
index a5dee49..c9bcac5 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.script;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.internal.context.EclContextPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.context,
diff --git a/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml
index cdfaf58..6e122ed 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.script</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF
index cd5539f..64b51d8 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.super;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,8 +11,8 @@
  org.eclipse.rcptt.ctx.internal.superc
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.superc.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml
index 1b5b5a3..b7121d7 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.super</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF
index 9bbfe78..855ea94 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.workbench.Activator
 Export-Package: org.eclipse.rcptt.ctx.internal.workbench
diff --git a/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml
index e52db2f..328d788 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/pom.xml b/core/contexts/pom.xml
index b2f81c1..3a2fa5f 100644
--- a/core/contexts/pom.xml
+++ b/core/contexts/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- CONTEXT PLUGINS -->
diff --git a/core/org.eclipse.rcptt.core-feature/feature.xml b/core/org.eclipse.rcptt.core-feature/feature.xml
index dc908c5..0d88308 100644
--- a/core/org.eclipse.rcptt.core-feature/feature.xml
+++ b/core/org.eclipse.rcptt.core-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rcptt.core"
       label="RCPTT Core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -40,175 +40,175 @@
    <requires>
       <import plugin="org.eclipse.emf.transaction"/>
       <import plugin="com.google.guava"/>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.search"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.builder"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.scenario"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.debug"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.group"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.parameters"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.parser"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.formatter"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.highlighter"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.scanner"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.logging"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -218,7 +218,7 @@
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -226,70 +226,70 @@
          id="org.eclipse.rcptt.ctx.super"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.capability"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.extensions"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.time"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.log"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.expandbar"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/core/org.eclipse.rcptt.core-feature/pom.xml b/core/org.eclipse.rcptt.core-feature/pom.xml
index 7ac250d..f4c4957 100644
--- a/core/org.eclipse.rcptt.core-feature/pom.xml
+++ b/core/org.eclipse.rcptt.core-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.core.features</groupId>
   <artifactId>org.eclipse.rcptt.core</artifactId>
diff --git a/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF
index d7ecce5..15ad8e1 100644
--- a/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.builder; singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.internal.builder.Q7BuilderActivator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.builder,
diff --git a/core/org.eclipse.rcptt.core.builder/pom.xml b/core/org.eclipse.rcptt.core.builder/pom.xml
index b4dc026..a25ef66 100644
--- a/core/org.eclipse.rcptt.core.builder/pom.xml
+++ b/core/org.eclipse.rcptt.core.builder/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.builder</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.core/.project b/core/org.eclipse.rcptt.core.ecl.core/.project
index 7e3e34e..c436dc7 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/.project
+++ b/core/org.eclipse.rcptt.core.ecl.core/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1559630453850</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
index 71614e3..7870477 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,15 +13,15 @@
  org.eclipse.rcptt.core.internal.ecl.core
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.core.scenario;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.ecl.operations
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.core.internal.ecl.core.Activator
diff --git a/core/org.eclipse.rcptt.core.ecl.core/pom.xml b/core/org.eclipse.rcptt.core.ecl.core/pom.xml
index 5fccc07..0b88894 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF
index 920de09..ba1146d 100644
--- a/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Formatter
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.formatter
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.formatter.internal.EclFormatterPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.formatter
diff --git a/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml b/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml
index 743871b..814fc44 100644
--- a/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.formatter</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF
index 3e616a2..cf4e90a 100644
--- a/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Highlighter
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.highlighter
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.highlighter.internal.EclHighlighterPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.highlighter
diff --git a/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml b/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml
index 6e4f623..5fcc8db 100644
--- a/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.highlighter</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF
index f95083b..369f6ec 100644
--- a/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Parser Tools for RCPTT
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.parser;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.internal.ecl.parser.Q7EclParserPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.doc;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.doc;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.model,
diff --git a/core/org.eclipse.rcptt.core.ecl.parser/pom.xml b/core/org.eclipse.rcptt.core.ecl.parser/pom.xml
index 326589f..2ff64a3 100644
--- a/core/org.eclipse.rcptt.core.ecl.parser/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.parser/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.parser</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF
index dac2ce2..0dbfcf4 100644
--- a/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Scanner
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.scanner
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.scanner.internal.EclScannerPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
diff --git a/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml b/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml
index eaecfe7..8dc3f66 100644
--- a/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.scanner</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF
index 5a8c4aa..132c4d5 100644
--- a/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.launching;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.launching.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.launching,
diff --git a/core/org.eclipse.rcptt.core.launching/pom.xml b/core/org.eclipse.rcptt.core.launching/pom.xml
index 979ca80..dd05e50 100644
--- a/core/org.eclipse.rcptt.core.launching/pom.xml
+++ b/core/org.eclipse.rcptt.core.launching/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.launching</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF
index 0df7624..ff57abb 100644
--- a/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.scenario;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.rcptt.core.scenario.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.scenario,
diff --git a/core/org.eclipse.rcptt.core.scenario/pom.xml b/core/org.eclipse.rcptt.core.scenario/pom.xml
index 4b2a213..644e0e6 100644
--- a/core/org.eclipse.rcptt.core.scenario/pom.xml
+++ b/core/org.eclipse.rcptt.core.scenario/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.scenario</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
index 26e1a12..7938a16 100644
--- a/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Indexed search in workspace
 Bundle-SymbolicName: org.eclipse.rcptt.core.search
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.rcptt.core;bundle-version="2.0.0",
  org.eclipse.core.runtime,
diff --git a/core/org.eclipse.rcptt.core.search/pom.xml b/core/org.eclipse.rcptt.core.search/pom.xml
index 692009f..207d755 100644
--- a/core/org.eclipse.rcptt.core.search/pom.xml
+++ b/core/org.eclipse.rcptt.core.search/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.search</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF
index 209cd7f..06c250f 100644
--- a/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Win64 fragment
 Bundle-SymbolicName: org.eclipse.rcptt.core.swt.win64;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
-Fragment-Host: org.eclipse.rcptt.core.swt;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.core.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (&(osgi.ws=win32) (osgi.arch=x86_64))
 Export-Package: org.eclipse.rcptt.util.swt
diff --git a/core/org.eclipse.rcptt.core.swt.win64/pom.xml b/core/org.eclipse.rcptt.core.swt.win64/pom.xml
index d226bea..d86d1fd 100644
--- a/core/org.eclipse.rcptt.core.swt.win64/pom.xml
+++ b/core/org.eclipse.rcptt.core.swt.win64/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.swt.win64</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF
index 8f4109b..9aa2caf 100644
--- a/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT RCPTT Utiilties
 Bundle-SymbolicName: org.eclipse.rcptt.core.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swt,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.tesla.recording.core.ecl,
  org.eclipse.jface,
  org.eclipse.jface.databinding
diff --git a/core/org.eclipse.rcptt.core.swt/pom.xml b/core/org.eclipse.rcptt.core.swt/pom.xml
index dd89a7c..f3e0535 100644
--- a/core/org.eclipse.rcptt.core.swt/pom.xml
+++ b/core/org.eclipse.rcptt.core.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF
index accaa48..9dde28c 100644
--- a/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -31,15 +31,15 @@
  org.eclipse.rcptt.internal.core.model.index
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.filesystem;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.internal.core.RcpttPlugin
diff --git a/core/org.eclipse.rcptt.core/pom.xml b/core/org.eclipse.rcptt.core/pom.xml
index d6be1c2..86bd03f 100644
--- a/core/org.eclipse.rcptt.core/pom.xml
+++ b/core/org.eclipse.rcptt.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF
index e1e7eaf..69f779f 100644
--- a/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.expandbar;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,7 +14,7 @@
  org.eclipse.rcptt.expandbar.widgets
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/core/org.eclipse.rcptt.expandbar/pom.xml b/core/org.eclipse.rcptt.expandbar/pom.xml
index 76f89fb..809c093 100644
--- a/core/org.eclipse.rcptt.expandbar/pom.xml
+++ b/core/org.eclipse.rcptt.expandbar/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.expandbar</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF
index bf762cb..44386a6 100644
--- a/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT runtime logging
 Bundle-SymbolicName: org.eclipse.rcptt.logging
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.logging.Q7LoggingPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: 
diff --git a/core/org.eclipse.rcptt.logging/pom.xml b/core/org.eclipse.rcptt.logging/pom.xml
index 444aa3c..df2f445 100644
--- a/core/org.eclipse.rcptt.logging/pom.xml
+++ b/core/org.eclipse.rcptt.logging/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>rcptt.core</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.logging</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF
index 4068abe..73f8ab8 100644
--- a/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.reporting;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,11 +13,11 @@
  org.eclipse.rcptt.reporting.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.reporting.internal.Q7ReportingPlugin
diff --git a/core/org.eclipse.rcptt.reporting/pom.xml b/core/org.eclipse.rcptt.reporting/pom.xml
index 030cd12..f2ed6a0 100644
--- a/core/org.eclipse.rcptt.reporting/pom.xml
+++ b/core/org.eclipse.rcptt.reporting/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>rcptt.core</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.reporting</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF
index 7c82f65..20afda0 100644
--- a/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.resources;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.resources,
diff --git a/core/org.eclipse.rcptt.resources/pom.xml b/core/org.eclipse.rcptt.resources/pom.xml
index d94e501..933e16a 100644
--- a/core/org.eclipse.rcptt.resources/pom.xml
+++ b/core/org.eclipse.rcptt.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
 		<artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla-feature/feature.xml b/core/org.eclipse.rcptt.tesla-feature/feature.xml
index 6329426..2bcbc8e 100644
--- a/core/org.eclipse.rcptt.tesla-feature/feature.xml
+++ b/core/org.eclipse.rcptt.tesla-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla"
       label="RCPTT Runtime core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -36,28 +36,28 @@
          id="org.eclipse.rcptt.tesla.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.core.context"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.logging"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/core/org.eclipse.rcptt.tesla-feature/pom.xml b/core/org.eclipse.rcptt.tesla-feature/pom.xml
index 59ac570..3c8b6d7 100644
--- a/core/org.eclipse.rcptt.tesla-feature/pom.xml
+++ b/core/org.eclipse.rcptt.tesla-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla</artifactId>
diff --git a/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF
index 5ae61b0..231e6a7 100644
--- a/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Context Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core.context
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.rcptt.tesla.core.context/pom.xml b/core/org.eclipse.rcptt.tesla.core.context/pom.xml
index f55f93d..a2666ef 100644
--- a/core/org.eclipse.rcptt.tesla.core.context/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.core.context/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.core.context</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF
index f749e64..51b76a3 100644
--- a/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.rcptt.tesla.core;visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.core,
diff --git a/core/org.eclipse.rcptt.tesla.core/pom.xml b/core/org.eclipse.rcptt.tesla.core/pom.xml
index 4de6120..ad5c26c 100644
--- a/core/org.eclipse.rcptt.tesla.core/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java
index ded8b74..14726e5 100644
--- a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java
+++ b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java
@@ -176,15 +176,15 @@
 		return getIntValue(CONTEXTS_WAITFORJOBS_TIMEOUT);
 	}
 
-	public static long getStepModeEnableTimeout() {
+	public static int getStepModeEnableTimeout() {
 		return getIntValue(JOB_STEPMODE_ENABLE_TIMEOUT);
 	}
 
-	public static long getStepModeStepTime() {
+	public static int getStepModeStepTime() {
 		return getIntValue(JOB_STEPMODE_STEP_TIME);
 	}
 
-	public static long getStepModeTimeout() {
+	public static int getStepModeTimeout() {
 		return getIntValue(JOB_STEPMODE_TIMEOUT);
 	}
 
diff --git a/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml b/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml
index 1159ca0..94805e0 100644
--- a/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml
+++ b/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla.ecl"
       label="RCPTT Runtime ECL Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,22 +29,22 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.core.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml b/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml
index 4de3a7d..a6f9d1c 100644
--- a/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla.ecl</artifactId>
diff --git a/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF
index f2c4086..d034819 100644
--- a/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl,
  org.eclipse.rcptt.tesla.ecl.model,
diff --git a/core/org.eclipse.rcptt.tesla.ecl/pom.xml b/core/org.eclipse.rcptt.tesla.ecl/pom.xml
index d3f73fe..4fd7f15 100644
--- a/core/org.eclipse.rcptt.tesla.ecl/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ecl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF
index 7749165..cf3f29b 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.core.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Export-Package: org.eclipse.rcptt.tesla.recording.core.ecl;
   uses:="org.eclipse.core.runtime,
    org.eclipse.rcptt.tesla.ecl.model,
diff --git a/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml b/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml
index 58756ca..c37ded9 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
   <artifactId>org.eclipse.rcptt.tesla.recording.core.ecl</artifactId>
diff --git a/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF
index f6f13e3..95c8a70 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Recording Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.core.internal.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xmi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.rcptt.tesla.recording.core/pom.xml b/core/org.eclipse.rcptt.tesla.recording.core/pom.xml
index 05c9dd1..e16163e 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.recording.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF
index c4945cb..a2521a5 100644
--- a/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.util.resources
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.rcptt.util.resources/pom.xml b/core/org.eclipse.rcptt.util.resources/pom.xml
index 103419e..4ccbe9a 100644
--- a/core/org.eclipse.rcptt.util.resources/pom.xml
+++ b/core/org.eclipse.rcptt.util.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
index d12fbf0..595d80b 100644
--- a/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Utilities Plugin which depends on JaveSE only
 Bundle-SymbolicName: org.eclipse.rcptt.util;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.util
diff --git a/core/org.eclipse.rcptt.util/pom.xml b/core/org.eclipse.rcptt.util/pom.xml
index 7a4f326..d106c45 100644
--- a/core/org.eclipse.rcptt.util/pom.xml
+++ b/core/org.eclipse.rcptt.util/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index a789396..b4a0433 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>core</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../releng/core/pom.xml</relativePath>
 	</parent>
 	<modules>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF
index 626859c..b08ed91 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.log;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,7 @@
  org.eclipse.rcptt.verifications.log.tools
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml
index 5d6a9e1..c060ad5 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.log</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF
index 6dd981e..3c4d6c7 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.resources;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,6 +10,6 @@
 Export-Package: org.eclipse.rcptt.verifications.resources
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml
index e2e5be0..d6b9c3a 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF
index e0db061..1abd940 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.text;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.text.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.text
diff --git a/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml
index f96483f..dc50a06 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.text</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF
index 7810117..05f0a4f 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.time;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.time.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.time
diff --git a/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml
index efe0cd0..9961b06 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.time</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF
index 8a870e5..ac10a33 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.tree;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
@@ -10,9 +10,9 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
  org.eclipse.rcptt.core.scenario,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.tree,
  org.eclipse.rcptt.verifications.tree.impl,
diff --git a/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml
index 4de098c..3da1edc 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.tree</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF
index c5a3646..7d70c12 100644
--- a/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.rcptt.verifications.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.status,
diff --git a/core/verifications/org.eclipse.rcptt.verifications/pom.xml b/core/verifications/org.eclipse.rcptt.verifications/pom.xml
index 8ebc432..edc2e93 100644
--- a/core/verifications/org.eclipse.rcptt.verifications/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/pom.xml b/core/verifications/pom.xml
index a44c7b3..bfcc43a 100644
--- a/core/verifications/pom.xml
+++ b/core/verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- VERIFICATION PLUGINS -->
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF
index f59bbf0..4cb6f52 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.aspectj.e38x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml
index 0645058..042c1f9 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.updates.aspectj.e38x</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF
index 14bf5ae..6e25d79 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.aspectj.e3x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml
index d9fa5fd..5846157 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.aspectj.e3x</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF
index c0f8e89..06a2a65 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.aspectj.e44x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
index 9642871..d49b8e6 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.aspectj.e44x</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF
index 9959c24..c50fa24 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.external.dependencies.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml
index d73a9cc..d8ade0d 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.external.dependencies.rap</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF
index 35e2537..efd91fe 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.extra;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml
index 31547e8..0458f85 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.extra</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF
index fc06b85..c35d0ae 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.helios;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml
index 90386b1..3ae34cc 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.updates.helios</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF
index 314db65..459710a 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.kepler;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml
index aef3c57..c08876b 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.updates.kepler</artifactId>
diff --git a/dependencies/bundles/pom.xml b/dependencies/bundles/pom.xml
index 937104f..238eb83 100644
--- a/dependencies/bundles/pom.xml
+++ b/dependencies/bundles/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>bundles</artifactId>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml
index 5826de6..0c89be8 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.external.dependencies.feature"
       label="RCPTT External Dependencies"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -32,38 +32,38 @@
          id="org.eclipse.rcptt.updates.helios"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.kepler"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e3x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e38x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e44x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.extra"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml
index 4d7a483..c432e18 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.external.dependencies.feature</artifactId>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml
index 7bdc7f6..4ffaa11 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.external.dependencies.rap.feature"
       label="RCPTT External Dependensies for RAP"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -32,7 +32,7 @@
          id="org.eclipse.rcptt.updates.external.dependencies.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml
index bd055d2..f63dfb7 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.external.dependencies.rap.feature</artifactId>
diff --git a/dependencies/features/pom.xml b/dependencies/features/pom.xml
index 52221a5..5c99d0a 100644
--- a/dependencies/features/pom.xml
+++ b/dependencies/features/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>features</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 46fcb8e..eaa9957 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
     	<groupId>org.eclipse.rcptt</groupId>
   		<artifactId>mirroring</artifactId>
-    	<version>2.4.4-SNAPSHOT</version>
+    	<version>2.5.0-SNAPSHOT</version>
     	<relativePath>../releng/mirroring/pom.xml</relativePath>
   	</parent>
 
diff --git a/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml
index 4abe189..4d468c5 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.core"
       label="RCPTT ECL Core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -37,21 +37,21 @@
          id="org.eclipse.rcptt.ecl.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.client.tcp"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.parser"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -65,63 +65,63 @@
          id="org.eclipse.rcptt.ecl.perf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.runtime"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.operations"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.data"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.data.apache.poi"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.interop"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.doc"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.filesystem"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.dispatch"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml
index 3c29904..d98a738 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.core</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml
index e534a97..6be1836 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.ide"
       label="RCPTT ECL IDE support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,21 +29,21 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml
index f15831e..c9abf1e 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.ide</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml
index 27bf650..a9b95c5 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.platform"
       label="RCPTT ECL Platform"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,14 +29,14 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.ecl.platform"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml
index b966dd6..439c517 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.platform</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml
index 01830dd..1e8092e 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.platform.ui"
       label="RCPTT ECL Platform UI"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,14 +29,14 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.ecl.platform.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml
index 39092a5..19a339f 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.platform.ui</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml
index 96636e9..41fb1d2 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.sdk"
       label="ECL SDK"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -30,6 +30,6 @@
 
    <includes
          id="org.eclipse.rcptt.ecl.core"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml
index f699196..4e61f52 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.sdk</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml
index 8a54509..d486d19 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature 
 	id="org.eclipse.rcptt.ecl.server" 
 	label="RCPTT ECL Server"
-	version="2.4.4.qualifier"
+	version="2.5.0.qualifier"
 	provider-name="%providerName">
 	
 	<description>
@@ -28,5 +28,5 @@
 		%license
 	</license>
 	
-	<plugin id="org.eclipse.rcptt.ecl.server.tcp" unpack="false" version="2.4.4.qualifier"/>
+	<plugin id="org.eclipse.rcptt.ecl.server.tcp" unpack="false" version="2.5.0.qualifier"/>
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml
index 9e08dc2..22d3300 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.server</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml
index 0c2eb0c..c2751ac 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature 
 	id="org.eclipse.rcptt.ecl.server.ui" 
 	label="ECL Server UI"
-	version="2.4.4.qualifier"
+	version="2.5.0.qualifier"
 	provider-name="%providerName">
 	
 	<description>
@@ -29,7 +29,7 @@
    </license>
 
     <requires>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
     </requires>
     
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml
index 73065eb..0112c8f 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.server.ui</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml
index 5fb8315..ce10a95 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml
@@ -14,7 +14,7 @@
 	id="org.eclipse.rcptt.ecl.shell" 
 	label="ECL Telnet Shell"
 	provider-name="%providerName"
-	version="2.4.4.qualifier">
+	version="2.5.0.qualifier">
 	
   <description>
 	Telnet shell for interactive remote execution of ECL commands
@@ -29,10 +29,10 @@
   </license>
   
   <requires>
-    <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
-    <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
+    <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
+    <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
   </requires>
   
-  <plugin unpack="false" id="org.eclipse.rcptt.ecl.telnet.server"  version="2.4.4.qualifier"/>
-  <plugin unpack="false" id="org.eclipse.rcptt.ecl.shell"  version="2.4.4.qualifier"/>
+  <plugin unpack="false" id="org.eclipse.rcptt.ecl.telnet.server"  version="2.5.0.qualifier"/>
+  <plugin unpack="false" id="org.eclipse.rcptt.ecl.shell"  version="2.5.0.qualifier"/>
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml
index d2cf8e2..73bca8f 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.shell</artifactId>
diff --git a/ecl/features/pom.xml b/ecl/features/pom.xml
index 0aaa30d..3f86dad 100644
--- a/ecl/features/pom.xml
+++ b/ecl/features/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF
index 40fbbff..ac304f0 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL TCP Client
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.client.tcp
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime
 Export-Package: org.eclipse.rcptt.ecl.client.tcp
 Bundle-Activator: org.eclipse.rcptt.ecl.client.tcp.EclTcpClientPlugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml
index 5e68112..d429900 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.client.tcp</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
index 92eb905..dcf99b7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Automatic-Module-Name: org.eclipse.rcptt.ecl.core
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
index c72b242..4bacdaa 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
@@ -153,6 +153,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="throwable" eType="#//Throwable"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="cause" eType="#//EclException"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="status" eType="#//ProcessStatus"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EclStackTraceEntry">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="index" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel
index 4133242..260473e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel
@@ -42,6 +42,7 @@
     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//Foreach">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/item"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/index"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/do"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/input"/>

     </genClasses>

@@ -54,6 +55,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//ProcessStatus/message"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//ProcessStatus/severity"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EReference ecl.ecore#//ProcessStatus/exception"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//ProcessStatus/children"/>

     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//ConvertedToEMFPipe">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//ConvertedToEMFPipe/object"/>

@@ -104,6 +106,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclException/stackTrace"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//EclException/throwable"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclException/cause"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclException/status"/>

     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//EclStackTraceEntry">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//EclStackTraceEntry/index"/>

@@ -166,7 +169,6 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclMapEntry/value"/>

     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//Case">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Case/input"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ecl.ecore#//Case/condition"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Case/then"/>

     </genClasses>

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml
index 3c64b29..b21cf18 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
index 95cff3d..fe78d3c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
@@ -28,7 +28,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.' returns='An internal object describing the case.' example='list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Corresponds command from &lt;code&gt;then&lt;/code&gt; branch if an object from the &lt;code&gt;input&lt;/code&gt; matches the &lt;code&gt;condition&lt;/code&gt; object.' returns='An internal object describing the case.' example='list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]'"
  * @generated
  */
 public interface Case extends Command {
@@ -44,7 +44,7 @@
 	 * @see #setCondition(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase_Condition()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Object used to match to the <code>input</code>. Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). '"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Object used to match to the &lt;code&gt;input&lt;/code&gt;. Accepted values are boolean, string (&lt;code&gt;true&lt;/code&gt; when case-insensitive equals to &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise) and number (&lt;code&gt;0&lt;/code&gt; for &lt;code&gt;false&lt;/code&gt;, &lt;code&gt;true&lt;/code&gt; otherwise). '"
 	 * @generated
 	 */
 	EObject getCondition();
@@ -71,7 +71,7 @@
 	 * @see #setThen(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase_Then()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed when <code>input</code> matches the object specified in <code>condition</code>'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed when &lt;code&gt;input&lt;/code&gt; matches the object specified in &lt;code&gt;condition&lt;/code&gt;'"
 	 * @generated
 	 */
 	Command getThen();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java
index 1d80d52..bbdd461 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java
@@ -43,7 +43,7 @@
 	 * @return the value of the '<em>Host</em>' attribute.
 	 * @see #setHost(String)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCommand_Host()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/ecl/internal"
 	 * @generated
 	 */
 	String getHost();
@@ -70,6 +70,7 @@
 	 * @return the value of the '<em>Bindings</em>' containment reference list.
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCommand_Bindings()
 	 * @model containment="true"
+	 *        annotation="http://www.eclipse.org/ecl/internal"
 	 * @generated
 	 */
 	EList<Binding> getBindings();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
index 3275ccd..5f7a0c8 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
@@ -1228,13 +1228,22 @@
 	int ECL_EXCEPTION__CAUSE = 4;
 
 	/**
+	 * The feature id for the '<em><b>Status</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_EXCEPTION__STATUS = 5;
+
+	/**
 	 * The number of structural features of the '<em>Ecl Exception</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ECL_EXCEPTION_FEATURE_COUNT = 5;
+	int ECL_EXCEPTION_FEATURE_COUNT = 6;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rcptt.ecl.core.impl.EclStackTraceEntryImpl <em>Ecl Stack Trace Entry</em>}' class.
@@ -2735,6 +2744,17 @@
 	EReference getEclException_Cause();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rcptt.ecl.core.EclException#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Status</em>'.
+	 * @see org.eclipse.rcptt.ecl.core.EclException#getStatus()
+	 * @see #getEclException()
+	 * @generated
+	 */
+	EReference getEclException_Status();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.rcptt.ecl.core.EclStackTraceEntry <em>Ecl Stack Trace Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4018,6 +4038,14 @@
 		EReference ECL_EXCEPTION__CAUSE = eINSTANCE.getEclException_Cause();
 
 		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ECL_EXCEPTION__STATUS = eINSTANCE.getEclException_Status();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.rcptt.ecl.core.impl.EclStackTraceEntryImpl <em>Ecl Stack Trace Entry</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java
index c6c1ba5..df28215 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java
@@ -27,6 +27,7 @@
  *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getStackTrace <em>Stack Trace</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getThrowable <em>Throwable</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getCause <em>Cause</em>}</li>
+ *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getStatus <em>Status</em>}</li>
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getEclException()
@@ -154,4 +155,26 @@
 	 */
 	void setCause(EclException value);
 
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' containment reference.
+	 * @see #setStatus(ProcessStatus)
+	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getEclException_Status()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ProcessStatus getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.EclException#getStatus <em>Status</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' containment reference.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(ProcessStatus value);
+
 } // EclException
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java
index 63e5479..012a4e3 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getExec()
- * @model
+ * @model annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface Exec extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java
index ccbdb62..caae986 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java
@@ -30,7 +30,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getForeach()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Reads objects from input pipe and for each object executes a given <code>do</code> command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a <code>do</code> command.  ' returns='An aggregated output of <code>do</code> command' example='// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Reads objects from input pipe and for each object executes a given &lt;code&gt;do&lt;/code&gt; command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a &lt;code&gt;do&lt;/code&gt; command.  ' returns='An aggregated output of &lt;code&gt;do&lt;/code&gt; command' example='// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}'"
  * @generated
  */
 public interface Foreach extends Command {
@@ -123,7 +123,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Input</em>' reference list.
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getForeach_Input()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/ecl/input"
 	 * @generated
 	 */
 	EList<EObject> getInput();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java
index ce63d30..b19f1ea 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getGet()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Depending on input object, either returns a value by key from <a href=\"#map\">map</a>, or element by index from <a href=\"#list\">list</a>, or member of EMF object by name.' example='//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Depending on input object, either returns a value by key from &lt;a href=\"#map\"&gt;map&lt;/a&gt;, or element by index from &lt;a href=\"#list\"&gt;list&lt;/a&gt;, or member of EMF object by name.' example='//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log'"
  * @generated
  */
 public interface Get extends Command {
@@ -43,6 +43,7 @@
 	 * @see #setInput(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getGet_Input()
 	 * @model containment="true"
+	 *        annotation="http://www.eclipse.org/ecl/input"
 	 *        annotation="http://www.eclipse.org/ecl/docs description='Object to get a value from'"
 	 * @generated
 	 */
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java
index 52610a2..cc80b07 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java
@@ -24,7 +24,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getGetVal()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Returns variable value by its name. Syntax sugar form <code>$name</code> can be used instead.'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Returns variable value by its name. Syntax sugar form &lt;code&gt;$name&lt;/code&gt; can be used instead.'"
  * @generated
  */
 public interface GetVal extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java
index 13a4519..f7a5c0e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java
@@ -26,7 +26,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getGlobal()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new global variable declaration.' returns='An internal object, describing a variable' example='// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new global variable declaration.' returns='An internal object, describing a variable' example='// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&amp;Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}'"
  * @generated
  */
 public interface Global extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java
index 5d7245d..9e067a1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java
@@ -28,7 +28,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Based on a condition corresponds either command either from <code>then</code> or <code>else</code> branch. ' returns='Output of executed branch' example='if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Based on a condition corresponds either command either from &lt;code&gt;then&lt;/code&gt; or &lt;code&gt;else&lt;/code&gt; branch. ' returns='Output of executed branch' example='if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}'"
  * @generated
  */
 public interface If extends Command {
@@ -43,7 +43,7 @@
 	 * @return the value of the '<em>Condition</em>' reference.
 	 * @see #setCondition(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf_Condition()
-	 * @model annotation="http://www.eclipse.org/ecl/docs description='Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). '"
+	 * @model annotation="http://www.eclipse.org/ecl/docs description='Accepted values are boolean, string (&lt;code&gt;true&lt;/code&gt; when case-insensitive equals to &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise) and number (&lt;code&gt;0&lt;/code&gt; for &lt;code&gt;false&lt;/code&gt;, &lt;code&gt;true&lt;/code&gt; otherwise). '"
 	 * @generated
 	 */
 	EObject getCondition();
@@ -70,7 +70,7 @@
 	 * @see #setThen(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf_Then()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on <code>true</code> input. Can be omitted.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on &lt;code&gt;true&lt;/code&gt; input. Can be omitted.'"
 	 * @generated
 	 */
 	Command getThen();
@@ -97,7 +97,7 @@
 	 * @see #setElse(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf_Else()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on <code>false</code> input. Can be omitted.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on &lt;code&gt;false&lt;/code&gt; input. Can be omitted.'"
 	 * @generated
 	 */
 	Command getElse();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java
index a89eeca..2738f37 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java
@@ -26,7 +26,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getLet()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Defines variables and evaluates <code>body</code> script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has <code>-input</code> flag, then <code>let</code> command must be used in a pipeline (see example 2). ' returns='An output of a <code>body</code> script' example='// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Defines variables and evaluates &lt;code&gt;body&lt;/code&gt; script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has &lt;code&gt;-input&lt;/code&gt; flag, then &lt;code&gt;let&lt;/code&gt; command must be used in a pipeline (see example 2). ' returns='An output of a &lt;code&gt;body&lt;/code&gt; script' example='// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n'"
  * @generated
  */
 public interface Let extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java
index 773c129..6688e8f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java
@@ -41,7 +41,7 @@
 	 * @see #setSource(String)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getListen_Source()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Source to listen for, for example, <code>errorLog</code>.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Source to listen for, for example, &lt;code&gt;errorLog&lt;/code&gt;.'"
 	 * @generated
 	 */
 	String getSource();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java
index 76af1e7..f0b1321 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getProc()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.' returns='An output of a <code>body</code> script' example='// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\"'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.' returns='An output of a &lt;code&gt;body&lt;/code&gt; script' example='// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\"'"
  * @generated
  */
 public interface Proc extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java
index a181f40..7f26778 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java
@@ -25,6 +25,7 @@
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getProcInstance()
  * @model annotation="http://www.eclipse.org/ecl/docs description='Marker superclass for user-defined procs'"
+ *        annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface ProcInstance extends Command {
@@ -39,7 +40,7 @@
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #setDefinition(Proc)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getProcInstance_Definition()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/ecl/internal"
 	 * @generated
 	 */
 	Proc getDefinition();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java
index ffadf3c..a76d9d3 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java
@@ -24,7 +24,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getRestoreState()
- * @model
+ * @model annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface RestoreState extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java
index 383c533..f680fc0 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java
@@ -18,7 +18,7 @@
  *
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getSaveState()
- * @model
+ * @model annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface SaveState extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java
index a58c56b..a3ee329 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java
@@ -31,7 +31,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Reads object from input pipe or <code>input</code> parameter and executes a <code>case</code> part with matching <code>condition</code> parameter (if any) sending <code>input</code> parameter as an input. If no <code>case</code> matched, the <code>default<code> block (if any) will be executed.' returns='An output of executed block (<code>case</code> command or <code>-default</code> block). If nothing is executed, no output will be produced.' example='list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Reads object from input pipe or &lt;code&gt;input&lt;/code&gt; parameter and executes a &lt;code&gt;case&lt;/code&gt; part with matching &lt;code&gt;condition&lt;/code&gt; parameter (if any) sending &lt;code&gt;input&lt;/code&gt; parameter as an input. If no &lt;code&gt;case&lt;/code&gt; matched, the &lt;code&gt;default&lt;code&gt; block (if any) will be executed.' returns='An output of executed block (&lt;code&gt;case&lt;/code&gt; command or &lt;code&gt;-default&lt;/code&gt; block). If nothing is executed, no output will be produced.' example='list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n'"
  * @generated
  */
 public interface Switch extends Command {
@@ -47,7 +47,7 @@
 	 * @return the value of the '<em>Items</em>' containment reference list.
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch_Items()
 	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='One or more <code>case</code> blocks. Block with a condition matching the input will be executed.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='One or more &lt;code&gt;case&lt;/code&gt; blocks. Block with a condition matching the input will be executed.'"
 	 * @generated
 	 */
 	EList<Case> getItems();
@@ -64,7 +64,7 @@
 	 * @see #setDefault(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch_Default()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Optional parameter. The block which will be executed in case no <code>case</code> block is executed.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Optional parameter. The block which will be executed in case no &lt;code&gt;case&lt;/code&gt; block is executed.'"
 	 * @generated
 	 */
 	Command getDefault();
@@ -91,6 +91,7 @@
 	 * @see #setInput(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch_Input()
 	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/ecl/input"
 	 *        annotation="http://www.eclipse.org/ecl/docs description='The input object to match.'"
 	 * @generated
 	 */
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java
index ba429a0..07ee92f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getVal()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new variable declaration. This command can be used only with <a href=\"#let\">let</a> and <a href=\"#proc\">proc</a>.' returns='An internal object, describing a variable' example='let [val button [get-button OK]] {\n    $button | click\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new variable declaration. This command can be used only with &lt;a href=\"#let\"&gt;let&lt;/a&gt; and &lt;a href=\"#proc\"&gt;proc&lt;/a&gt;.' returns='An internal object, describing a variable' example='let [val button [get-button OK]] {\n    $button | click\n}'"
  * @generated
  */
 public interface Val extends Declaration {
@@ -96,7 +96,7 @@
 	 * @return the value of the '<em>Value</em>' reference.
 	 * @see #setValue(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getVal_Value()
-	 * @model annotation="http://www.eclipse.org/ecl/docs description='Variable value. When variable is defined in <a href=\"#proc\">proc</a> block, this value denotes the default parameter value.'"
+	 * @model annotation="http://www.eclipse.org/ecl/docs description='Variable value. When variable is defined in &lt;a href=\"#proc\"&gt;proc&lt;/a&gt; block, this value denotes the default parameter value.'"
 	 * @generated
 	 */
 	EObject getValue();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java
index 1093dfb..05dee2e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java
@@ -26,7 +26,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getWith()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Executes a <code>do</code> script by passing given <code>object</code> to each command inside <code>do</code>. The primary use case for this command is to extract a common prefix for a sequence of commands.' returns='Output of a <code>do</code> command' example='get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Executes a &lt;code&gt;do&lt;/code&gt; script by passing given &lt;code&gt;object&lt;/code&gt; to each command inside &lt;code&gt;do&lt;/code&gt;. The primary use case for this command is to extract a common prefix for a sequence of commands.' returns='Output of a &lt;code&gt;do&lt;/code&gt; command' example='get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n'"
  * @generated
  */
 public interface With extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java
index 06e76c4..b7bdc97 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java
@@ -83,6 +83,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EStructuralFeature getFeature() {
 		if (feature != null && feature.eIsProxy()) {
 			InternalEObject oldFeature = (InternalEObject)feature;
@@ -109,6 +110,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFeature(EStructuralFeature newFeature) {
 		EStructuralFeature oldFeature = feature;
 		feature = newFeature;
@@ -121,6 +123,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getCommand() {
 		return command;
 	}
@@ -145,6 +148,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCommand(Command newCommand) {
 		if (newCommand != command) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java
index 9031991..9dbb03b 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java
@@ -74,6 +74,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Command> getCommands() {
 		if (commands == null) {
 			commands = new EObjectContainmentEList<Command>(Command.class, this, CorePackage.BLOCK__COMMANDS);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
index 166e087..6c6963e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
@@ -84,6 +84,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getCondition() {
 		if (condition != null && condition.eIsProxy()) {
 			InternalEObject oldCondition = (InternalEObject)condition;
@@ -110,6 +111,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCondition(EObject newCondition) {
 		EObject oldCondition = condition;
 		condition = newCondition;
@@ -122,6 +124,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getThen() {
 		return then;
 	}
@@ -146,6 +149,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setThen(Command newThen) {
 		if (newThen != then) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java
index 4b39d03..84603e4 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java
@@ -99,6 +99,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getHost() {
 		return host;
 	}
@@ -108,6 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setHost(String newHost) {
 		String oldHost = host;
 		host = newHost;
@@ -120,6 +122,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Binding> getBindings() {
 		if (bindings == null) {
 			bindings = new EObjectContainmentEList<Binding>(Binding.class, this, CorePackage.COMMAND__BINDINGS);
@@ -220,7 +223,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (host: ");
 		result.append(host);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java
index 5f8d2ae..9f0bab6 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java
@@ -71,6 +71,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getObject() {
 		return object;
 	}
@@ -95,6 +96,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setObject(EObject newObject) {
 		if (newObject != object) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java
index 27d0804..1ff568d 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java
@@ -148,6 +148,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command createCommand() {
 		CommandImpl command = new CommandImpl();
 		return command;
@@ -158,6 +159,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Binding createBinding() {
 		BindingImpl binding = new BindingImpl();
 		return binding;
@@ -168,6 +170,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Pipeline createPipeline() {
 		PipelineImpl pipeline = new PipelineImpl();
 		return pipeline;
@@ -178,6 +181,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Sequence createSequence() {
 		SequenceImpl sequence = new SequenceImpl();
 		return sequence;
@@ -188,6 +192,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Parallel createParallel() {
 		ParallelImpl parallel = new ParallelImpl();
 		return parallel;
@@ -198,6 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public With createWith() {
 		WithImpl with = new WithImpl();
 		return with;
@@ -208,6 +214,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Exec createExec() {
 		ExecImpl exec = new ExecImpl();
 		return exec;
@@ -218,6 +225,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Parameter createParameter() {
 		ParameterImpl parameter = new ParameterImpl();
 		return parameter;
@@ -228,6 +236,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ExecutableParameter createExecutableParameter() {
 		ExecutableParameterImpl executableParameter = new ExecutableParameterImpl();
 		return executableParameter;
@@ -238,6 +247,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public LiteralParameter createLiteralParameter() {
 		LiteralParameterImpl literalParameter = new LiteralParameterImpl();
 		return literalParameter;
@@ -248,6 +258,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Foreach createForeach() {
 		ForeachImpl foreach = new ForeachImpl();
 		return foreach;
@@ -258,6 +269,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ProcessStatus createProcessStatus() {
 		ProcessStatusImpl processStatus = new ProcessStatusImpl();
 		return processStatus;
@@ -268,6 +280,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ConvertedToEMFPipe createConvertedToEMFPipe() {
 		ConvertedToEMFPipeImpl convertedToEMFPipe = new ConvertedToEMFPipeImpl();
 		return convertedToEMFPipe;
@@ -278,6 +291,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Serialized createSerialized() {
 		SerializedImpl serialized = new SerializedImpl();
 		return serialized;
@@ -288,6 +302,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Nullable createNullable() {
 		NullableImpl nullable = new NullableImpl();
 		return nullable;
@@ -298,6 +313,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public If createIf() {
 		IfImpl if_ = new IfImpl();
 		return if_;
@@ -308,6 +324,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclByte createEclByte() {
 		EclByteImpl eclByte = new EclByteImpl();
 		return eclByte;
@@ -318,6 +335,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclShort createEclShort() {
 		EclShortImpl eclShort = new EclShortImpl();
 		return eclShort;
@@ -328,6 +346,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclString createEclString() {
 		EclStringImpl eclString = new EclStringImpl();
 		return eclString;
@@ -338,6 +357,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclException createEclException() {
 		EclExceptionImpl eclException = new EclExceptionImpl();
 		return eclException;
@@ -348,6 +368,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclStackTraceEntry createEclStackTraceEntry() {
 		EclStackTraceEntryImpl eclStackTraceEntry = new EclStackTraceEntryImpl();
 		return eclStackTraceEntry;
@@ -358,6 +379,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Listen createListen() {
 		ListenImpl listen = new ListenImpl();
 		return listen;
@@ -368,6 +390,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Declaration createDeclaration() {
 		DeclarationImpl declaration = new DeclarationImpl();
 		return declaration;
@@ -378,6 +401,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Val createVal() {
 		ValImpl val = new ValImpl();
 		return val;
@@ -388,6 +412,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public GetVal createGetVal() {
 		GetValImpl getVal = new GetValImpl();
 		return getVal;
@@ -398,6 +423,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Let createLet() {
 		LetImpl let = new LetImpl();
 		return let;
@@ -408,6 +434,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Proc createProc() {
 		ProcImpl proc = new ProcImpl();
 		return proc;
@@ -418,6 +445,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ProcInstance createProcInstance() {
 		ProcInstanceImpl procInstance = new ProcInstanceImpl();
 		return procInstance;
@@ -428,6 +456,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Global createGlobal() {
 		GlobalImpl global = new GlobalImpl();
 		return global;
@@ -438,6 +467,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SessionState createSessionState() {
 		SessionStateImpl sessionState = new SessionStateImpl();
 		return sessionState;
@@ -448,6 +478,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SaveState createSaveState() {
 		SaveStateImpl saveState = new SaveStateImpl();
 		return saveState;
@@ -458,6 +489,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RestoreState createRestoreState() {
 		RestoreStateImpl restoreState = new RestoreStateImpl();
 		return restoreState;
@@ -468,6 +500,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Get createGet() {
 		GetImpl get = new GetImpl();
 		return get;
@@ -478,6 +511,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclList createEclList() {
 		EclListImpl eclList = new EclListImpl();
 		return eclList;
@@ -488,6 +522,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclMap createEclMap() {
 		EclMapImpl eclMap = new EclMapImpl();
 		return eclMap;
@@ -498,6 +533,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclMapEntry createEclMapEntry() {
 		EclMapEntryImpl eclMapEntry = new EclMapEntryImpl();
 		return eclMapEntry;
@@ -508,6 +544,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Case createCase() {
 		CaseImpl case_ = new CaseImpl();
 		return case_;
@@ -518,6 +555,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Switch createSwitch() {
 		SwitchImpl switch_ = new SwitchImpl();
 		return switch_;
@@ -528,6 +566,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclBoolean createEclBoolean() {
 		EclBooleanImpl eclBoolean = new EclBooleanImpl();
 		return eclBoolean;
@@ -538,6 +577,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclChar createEclChar() {
 		EclCharImpl eclChar = new EclCharImpl();
 		return eclChar;
@@ -548,6 +588,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclInteger createEclInteger() {
 		EclIntegerImpl eclInteger = new EclIntegerImpl();
 		return eclInteger;
@@ -558,6 +599,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclFloat createEclFloat() {
 		EclFloatImpl eclFloat = new EclFloatImpl();
 		return eclFloat;
@@ -568,6 +610,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclLong createEclLong() {
 		EclLongImpl eclLong = new EclLongImpl();
 		return eclLong;
@@ -578,6 +621,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclDouble createEclDouble() {
 		EclDoubleImpl eclDouble = new EclDoubleImpl();
 		return eclDouble;
@@ -606,6 +650,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Script createScript() {
 		ScriptImpl script = new ScriptImpl();
 		return script;
@@ -616,6 +661,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CorePackage getCorePackage() {
 		return (CorePackage)getEPackage();
 	}
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
index 402fe44..557e532 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
@@ -422,7 +422,8 @@
 		if (isInited) return (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
 
 		// Obtain or create and register package
-		CorePackageImpl theCorePackage = (CorePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CorePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CorePackageImpl());
+		Object registeredCorePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		CorePackageImpl theCorePackage = registeredCorePackage instanceof CorePackageImpl ? (CorePackageImpl)registeredCorePackage : new CorePackageImpl();
 
 		isInited = true;
 
@@ -438,7 +439,6 @@
 		// Mark meta-data to indicate it can't be changed
 		theCorePackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(CorePackage.eNS_URI, theCorePackage);
 		return theCorePackage;
@@ -448,6 +448,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCommand() {
 		return commandEClass;
 	}
@@ -456,6 +457,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCommand_Host() {
 		return (EAttribute)commandEClass.getEStructuralFeatures().get(0);
 	}
@@ -464,6 +466,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCommand_Bindings() {
 		return (EReference)commandEClass.getEStructuralFeatures().get(1);
 	}
@@ -472,6 +475,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBinding() {
 		return bindingEClass;
 	}
@@ -480,6 +484,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBinding_Feature() {
 		return (EReference)bindingEClass.getEStructuralFeatures().get(0);
 	}
@@ -488,6 +493,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBinding_Command() {
 		return (EReference)bindingEClass.getEStructuralFeatures().get(1);
 	}
@@ -496,6 +502,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBlock() {
 		return blockEClass;
 	}
@@ -504,6 +511,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBlock_Commands() {
 		return (EReference)blockEClass.getEStructuralFeatures().get(0);
 	}
@@ -512,6 +520,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPipeline() {
 		return pipelineEClass;
 	}
@@ -520,6 +529,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSequence() {
 		return sequenceEClass;
 	}
@@ -528,6 +538,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getParallel() {
 		return parallelEClass;
 	}
@@ -536,6 +547,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWith() {
 		return withEClass;
 	}
@@ -544,6 +556,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWith_Object() {
 		return (EReference)withEClass.getEStructuralFeatures().get(0);
 	}
@@ -552,6 +565,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWith_Do() {
 		return (EReference)withEClass.getEStructuralFeatures().get(1);
 	}
@@ -560,6 +574,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getExec() {
 		return execEClass;
 	}
@@ -568,6 +583,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getExec_Namespace() {
 		return (EAttribute)execEClass.getEStructuralFeatures().get(0);
 	}
@@ -576,6 +592,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getExec_Name() {
 		return (EAttribute)execEClass.getEStructuralFeatures().get(1);
 	}
@@ -584,6 +601,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getExec_Parameters() {
 		return (EReference)execEClass.getEStructuralFeatures().get(2);
 	}
@@ -592,6 +610,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getParameter() {
 		return parameterEClass;
 	}
@@ -600,6 +619,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getParameter_Name() {
 		return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
 	}
@@ -608,6 +628,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getExecutableParameter() {
 		return executableParameterEClass;
 	}
@@ -616,6 +637,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getExecutableParameter_Command() {
 		return (EReference)executableParameterEClass.getEStructuralFeatures().get(0);
 	}
@@ -624,6 +646,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getLiteralParameter() {
 		return literalParameterEClass;
 	}
@@ -632,6 +655,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getLiteralParameter_Literal() {
 		return (EAttribute)literalParameterEClass.getEStructuralFeatures().get(0);
 	}
@@ -640,6 +664,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getLiteralParameter_Format() {
 		return (EAttribute)literalParameterEClass.getEStructuralFeatures().get(1);
 	}
@@ -648,6 +673,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getForeach() {
 		return foreachEClass;
 	}
@@ -657,6 +683,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Item() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(0);
 	}
@@ -666,6 +693,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Index() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(1);
 	}
@@ -674,6 +702,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Do() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(2);
 	}
@@ -682,6 +711,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Input() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(3);
 	}
@@ -690,6 +720,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getProcessStatus() {
 		return processStatusEClass;
 	}
@@ -698,6 +729,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_PluginId() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(0);
 	}
@@ -706,6 +738,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_Code() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(1);
 	}
@@ -714,6 +747,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_Message() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(2);
 	}
@@ -722,6 +756,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_Severity() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(3);
 	}
@@ -730,6 +765,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProcessStatus_Exception() {
 		return (EReference)processStatusEClass.getEStructuralFeatures().get(4);
 	}
@@ -739,6 +775,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProcessStatus_Children() {
 		return (EReference)processStatusEClass.getEStructuralFeatures().get(5);
 	}
@@ -747,6 +784,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getConvertedToEMFPipe() {
 		return convertedToEMFPipeEClass;
 	}
@@ -755,6 +793,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConvertedToEMFPipe_Object() {
 		return (EReference)convertedToEMFPipeEClass.getEStructuralFeatures().get(0);
 	}
@@ -763,6 +802,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSerialized() {
 		return serializedEClass;
 	}
@@ -771,6 +811,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSerialized_Bytes() {
 		return (EAttribute)serializedEClass.getEStructuralFeatures().get(0);
 	}
@@ -779,6 +820,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getNullable() {
 		return nullableEClass;
 	}
@@ -787,6 +829,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNullable_Value() {
 		return (EReference)nullableEClass.getEStructuralFeatures().get(0);
 	}
@@ -795,6 +838,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getNullable_Type() {
 		return (EAttribute)nullableEClass.getEStructuralFeatures().get(1);
 	}
@@ -803,6 +847,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getIf() {
 		return ifEClass;
 	}
@@ -811,6 +856,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getIf_Condition() {
 		return (EReference)ifEClass.getEStructuralFeatures().get(0);
 	}
@@ -819,6 +865,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getIf_Then() {
 		return (EReference)ifEClass.getEStructuralFeatures().get(1);
 	}
@@ -827,6 +874,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getIf_Else() {
 		return (EReference)ifEClass.getEStructuralFeatures().get(2);
 	}
@@ -835,6 +883,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclString() {
 		return eclStringEClass;
 	}
@@ -843,6 +892,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclString_Value() {
 		return (EAttribute)eclStringEClass.getEStructuralFeatures().get(0);
 	}
@@ -851,6 +901,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclException() {
 		return eclExceptionEClass;
 	}
@@ -859,6 +910,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclException_ClassName() {
 		return (EAttribute)eclExceptionEClass.getEStructuralFeatures().get(0);
 	}
@@ -867,6 +919,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclException_Message() {
 		return (EAttribute)eclExceptionEClass.getEStructuralFeatures().get(1);
 	}
@@ -875,6 +928,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclException_StackTrace() {
 		return (EReference)eclExceptionEClass.getEStructuralFeatures().get(2);
 	}
@@ -883,6 +937,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclException_Throwable() {
 		return (EAttribute)eclExceptionEClass.getEStructuralFeatures().get(3);
 	}
@@ -891,14 +946,26 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclException_Cause() {
 		return (EReference)eclExceptionEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEclException_Status() {
+		return (EReference)eclExceptionEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclStackTraceEntry() {
 		return eclStackTraceEntryEClass;
 	}
@@ -907,6 +974,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_Index() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(0);
 	}
@@ -915,6 +983,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_DeclaringClass() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(1);
 	}
@@ -923,6 +992,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_MethodName() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(2);
 	}
@@ -931,6 +1001,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_FileName() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(3);
 	}
@@ -939,6 +1010,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_LineNumber() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(4);
 	}
@@ -947,6 +1019,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_NativeMethod() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(5);
 	}
@@ -955,6 +1028,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getListen() {
 		return listenEClass;
 	}
@@ -963,6 +1037,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getListen_Source() {
 		return (EAttribute)listenEClass.getEStructuralFeatures().get(0);
 	}
@@ -971,6 +1046,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getListen_While() {
 		return (EReference)listenEClass.getEStructuralFeatures().get(1);
 	}
@@ -980,6 +1056,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getDeclaration() {
 		return declarationEClass;
 	}
@@ -989,6 +1066,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getVal() {
 		return valEClass;
 	}
@@ -998,6 +1076,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getVal_Name() {
 		return (EAttribute)valEClass.getEStructuralFeatures().get(0);
 	}
@@ -1007,6 +1086,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getVal_Input() {
 		return (EAttribute)valEClass.getEStructuralFeatures().get(2);
 	}
@@ -1016,6 +1096,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getVal_Value() {
 		return (EReference)valEClass.getEStructuralFeatures().get(1);
 	}
@@ -1025,6 +1106,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGetVal() {
 		return getValEClass;
 	}
@@ -1034,6 +1116,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGetVal_Name() {
 		return (EAttribute)getValEClass.getEStructuralFeatures().get(0);
 	}
@@ -1043,6 +1126,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getLet() {
 		return letEClass;
 	}
@@ -1052,6 +1136,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLet_Vals() {
 		return (EReference)letEClass.getEStructuralFeatures().get(0);
 	}
@@ -1061,6 +1146,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLet_Body() {
 		return (EReference)letEClass.getEStructuralFeatures().get(1);
 	}
@@ -1070,6 +1156,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getProc() {
 		return procEClass;
 	}
@@ -1079,6 +1166,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProc_Name() {
 		return (EAttribute)procEClass.getEStructuralFeatures().get(0);
 	}
@@ -1088,6 +1176,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProc_Vals() {
 		return (EReference)procEClass.getEStructuralFeatures().get(1);
 	}
@@ -1097,6 +1186,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProc_Body() {
 		return (EReference)procEClass.getEStructuralFeatures().get(2);
 	}
@@ -1106,6 +1196,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getProcInstance() {
 		return procInstanceEClass;
 	}
@@ -1115,6 +1206,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProcInstance_Definition() {
 		return (EReference)procInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -1124,6 +1216,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGlobal() {
 		return globalEClass;
 	}
@@ -1133,6 +1226,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGlobal_Vals() {
 		return (EReference)globalEClass.getEStructuralFeatures().get(0);
 	}
@@ -1142,6 +1236,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGlobal_Override() {
 		return (EAttribute)globalEClass.getEStructuralFeatures().get(1);
 	}
@@ -1151,6 +1246,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSessionState() {
 		return sessionStateEClass;
 	}
@@ -1160,6 +1256,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSessionState_Procs() {
 		return (EReference)sessionStateEClass.getEStructuralFeatures().get(0);
 	}
@@ -1169,6 +1266,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSessionState_Decls() {
 		return (EReference)sessionStateEClass.getEStructuralFeatures().get(1);
 	}
@@ -1178,6 +1276,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSaveState() {
 		return saveStateEClass;
 	}
@@ -1187,6 +1286,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRestoreState() {
 		return restoreStateEClass;
 	}
@@ -1196,6 +1296,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRestoreState_State() {
 		return (EReference)restoreStateEClass.getEStructuralFeatures().get(0);
 	}
@@ -1205,6 +1306,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGet() {
 		return getEClass;
 	}
@@ -1214,6 +1316,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGet_Input() {
 		return (EReference)getEClass.getEStructuralFeatures().get(0);
 	}
@@ -1223,6 +1326,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGet_Key() {
 		return (EReference)getEClass.getEStructuralFeatures().get(1);
 	}
@@ -1232,6 +1336,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGet_Default() {
 		return (EReference)getEClass.getEStructuralFeatures().get(2);
 	}
@@ -1241,6 +1346,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclList() {
 		return eclListEClass;
 	}
@@ -1250,6 +1356,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclList_Elements() {
 		return (EReference)eclListEClass.getEStructuralFeatures().get(0);
 	}
@@ -1259,6 +1366,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclMap() {
 		return eclMapEClass;
 	}
@@ -1268,6 +1376,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclMap_Entries() {
 		return (EReference)eclMapEClass.getEStructuralFeatures().get(0);
 	}
@@ -1277,6 +1386,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclMapEntry() {
 		return eclMapEntryEClass;
 	}
@@ -1286,6 +1396,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclMapEntry_Key() {
 		return (EReference)eclMapEntryEClass.getEStructuralFeatures().get(0);
 	}
@@ -1295,6 +1406,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclMapEntry_Value() {
 		return (EReference)eclMapEntryEClass.getEStructuralFeatures().get(1);
 	}
@@ -1304,6 +1416,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCase() {
 		return caseEClass;
 	}
@@ -1313,6 +1426,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCase_Condition() {
 		return (EReference)caseEClass.getEStructuralFeatures().get(0);
 	}
@@ -1322,6 +1436,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCase_Then() {
 		return (EReference)caseEClass.getEStructuralFeatures().get(1);
 	}
@@ -1331,6 +1446,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSwitch() {
 		return switchEClass;
 	}
@@ -1340,6 +1456,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSwitch_Items() {
 		return (EReference)switchEClass.getEStructuralFeatures().get(1);
 	}
@@ -1349,6 +1466,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSwitch_Default() {
 		return (EReference)switchEClass.getEStructuralFeatures().get(2);
 	}
@@ -1358,6 +1476,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSwitch_Input() {
 		return (EReference)switchEClass.getEStructuralFeatures().get(0);
 	}
@@ -1366,6 +1485,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclBoolean() {
 		return eclBooleanEClass;
 	}
@@ -1374,6 +1494,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclBoolean_Value() {
 		return (EAttribute)eclBooleanEClass.getEStructuralFeatures().get(0);
 	}
@@ -1382,6 +1503,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclChar() {
 		return eclCharEClass;
 	}
@@ -1390,6 +1512,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclChar_Value() {
 		return (EAttribute)eclCharEClass.getEStructuralFeatures().get(0);
 	}
@@ -1398,6 +1521,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclInteger() {
 		return eclIntegerEClass;
 	}
@@ -1406,6 +1530,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclInteger_Value() {
 		return (EAttribute)eclIntegerEClass.getEStructuralFeatures().get(0);
 	}
@@ -1414,6 +1539,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclFloat() {
 		return eclFloatEClass;
 	}
@@ -1422,6 +1548,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclFloat_Value() {
 		return (EAttribute)eclFloatEClass.getEStructuralFeatures().get(0);
 	}
@@ -1430,6 +1557,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclLong() {
 		return eclLongEClass;
 	}
@@ -1438,6 +1566,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclLong_Value() {
 		return (EAttribute)eclLongEClass.getEStructuralFeatures().get(0);
 	}
@@ -1446,6 +1575,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclDouble() {
 		return eclDoubleEClass;
 	}
@@ -1454,6 +1584,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclDouble_Value() {
 		return (EAttribute)eclDoubleEClass.getEStructuralFeatures().get(0);
 	}
@@ -1462,6 +1593,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBoxedValue() {
 		return boxedValueEClass;
 	}
@@ -1470,6 +1602,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclByte() {
 		return eclByteEClass;
 	}
@@ -1478,6 +1611,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclByte_Value() {
 		return (EAttribute)eclByteEClass.getEStructuralFeatures().get(0);
 	}
@@ -1486,6 +1620,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclShort() {
 		return eclShortEClass;
 	}
@@ -1494,6 +1629,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclShort_Value() {
 		return (EAttribute)eclShortEClass.getEStructuralFeatures().get(0);
 	}
@@ -1502,6 +1638,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EDataType getThrowable() {
 		return throwableEDataType;
 	}
@@ -1510,6 +1647,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getScript() {
 		return scriptEClass;
 	}
@@ -1518,6 +1656,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getScript_Content() {
 		return (EAttribute)scriptEClass.getEStructuralFeatures().get(0);
 	}
@@ -1526,6 +1665,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CoreFactory getCoreFactory() {
 		return (CoreFactory)getEFactoryInstance();
 	}
@@ -1651,6 +1791,7 @@
 		createEReference(eclExceptionEClass, ECL_EXCEPTION__STACK_TRACE);
 		createEAttribute(eclExceptionEClass, ECL_EXCEPTION__THROWABLE);
 		createEReference(eclExceptionEClass, ECL_EXCEPTION__CAUSE);
+		createEReference(eclExceptionEClass, ECL_EXCEPTION__STATUS);
 
 		eclStackTraceEntryEClass = createEClass(ECL_STACK_TRACE_ENTRY);
 		createEAttribute(eclStackTraceEntryEClass, ECL_STACK_TRACE_ENTRY__INDEX);
@@ -1895,6 +2036,7 @@
 		initEReference(getEclException_StackTrace(), this.getEclStackTraceEntry(), null, "stackTrace", null, 0, -1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEclException_Throwable(), this.getThrowable(), "throwable", null, 0, 1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEclException_Cause(), this.getEclException(), null, "cause", null, 0, 1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEclException_Status(), this.getProcessStatus(), null, "status", null, 0, 1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(eclStackTraceEntryEClass, EclStackTraceEntry.class, "EclStackTraceEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getEclStackTraceEntry_Index(), theEcorePackage.getEInt(), "index", null, 0, 1, EclStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1989,40 +2131,40 @@
 	 * @generated
 	 */
 	protected void createInternalAnnotations() {
-		String source = "http://www.eclipse.org/ecl/internal";	
+		String source = "http://www.eclipse.org/ecl/internal";
 		addAnnotation
-		  (getCommand_Host(), 
-		   source, 
+		  (getCommand_Host(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getCommand_Bindings(), 
-		   source, 
+		  (getCommand_Bindings(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (execEClass, 
-		   source, 
+		  (execEClass,
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (procInstanceEClass, 
-		   source, 
+		  (procInstanceEClass,
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getProcInstance_Definition(), 
-		   source, 
+		  (getProcInstance_Definition(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (saveStateEClass, 
-		   source, 
+		  (saveStateEClass,
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (restoreStateEClass, 
-		   source, 
+		  (restoreStateEClass,
+		   source,
 		   new String[] {
 		   });
 	}
@@ -2033,20 +2175,20 @@
 	 * @generated
 	 */
 	protected void createInputAnnotations() {
-		String source = "http://www.eclipse.org/ecl/input";	
+		String source = "http://www.eclipse.org/ecl/input";
 		addAnnotation
-		  (getForeach_Input(), 
-		   source, 
+		  (getForeach_Input(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getGet_Input(), 
-		   source, 
+		  (getGet_Input(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getSwitch_Input(), 
-		   source, 
+		  (getSwitch_Input(),
+		   source,
 		   new String[] {
 		   });
 	}
@@ -2057,219 +2199,219 @@
 	 * @generated
 	 */
 	protected void createDocsAnnotations() {
-		String source = "http://www.eclipse.org/ecl/docs";	
+		String source = "http://www.eclipse.org/ecl/docs";
 		addAnnotation
-		  (withEClass, 
-		   source, 
+		  (withEClass,
+		   source,
 		   new String[] {
-			 "description", "Executes a <code>do</code> script by passing given <code>object</code> to each command inside <code>do</code>. The primary use case for this command is to extract a common prefix for a sequence of commands.",
-			 "returns", "Output of a <code>do</code> command",
-			 "example", "get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n"
-		   });	
+			   "description", "Executes a <code>do</code> script by passing given <code>object</code> to each command inside <code>do</code>. The primary use case for this command is to extract a common prefix for a sequence of commands.",
+			   "returns", "Output of a <code>do</code> command",
+			   "example", "get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n"
+		   });
 		addAnnotation
-		  (foreachEClass, 
-		   source, 
+		  (foreachEClass,
+		   source,
 		   new String[] {
-			 "description", "Reads objects from input pipe and for each object executes a given <code>do</code> command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a <code>do</code> command.  ",
-			 "returns", "An aggregated output of <code>do</code> command",
-			 "example", "// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}"
-		   });	
+			   "description", "Reads objects from input pipe and for each object executes a given <code>do</code> command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a <code>do</code> command.  ",
+			   "returns", "An aggregated output of <code>do</code> command",
+			   "example", "// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}"
+		   });
 		addAnnotation
-		  (ifEClass, 
-		   source, 
+		  (ifEClass,
+		   source,
 		   new String[] {
-			 "description", "Based on a condition corresponds either command either from <code>then</code> or <code>else</code> branch. ",
-			 "returns", "Output of executed branch",
-			 "example", "if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}"
-		   });	
+			   "description", "Based on a condition corresponds either command either from <code>then</code> or <code>else</code> branch. ",
+			   "returns", "Output of executed branch",
+			   "example", "if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}"
+		   });
 		addAnnotation
-		  (getIf_Condition(), 
-		   source, 
+		  (getIf_Condition(),
+		   source,
 		   new String[] {
-			 "description", "Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
-		   });	
+			   "description", "Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
+		   });
 		addAnnotation
-		  (getIf_Then(), 
-		   source, 
+		  (getIf_Then(),
+		   source,
 		   new String[] {
-			 "description", "Branch being executed on <code>true</code> input. Can be omitted."
-		   });	
+			   "description", "Branch being executed on <code>true</code> input. Can be omitted."
+		   });
 		addAnnotation
-		  (getIf_Else(), 
-		   source, 
+		  (getIf_Else(),
+		   source,
 		   new String[] {
-			 "description", "Branch being executed on <code>false</code> input. Can be omitted."
-		   });	
+			   "description", "Branch being executed on <code>false</code> input. Can be omitted."
+		   });
 		addAnnotation
-		  (listenEClass, 
-		   source, 
+		  (listenEClass,
+		   source,
 		   new String[] {
-			 "description", "Listens for state changes while executing commands.",
-			 "returns", "State difference before and after execution.",
-			 "example", "// assert no new errors while clicking on the button\r\nlisten errorLog {\r\n\tget-button OK | click\r\n} | assert-empty"
-		   });	
+			   "description", "Listens for state changes while executing commands.",
+			   "returns", "State difference before and after execution.",
+			   "example", "// assert no new errors while clicking on the button\r\nlisten errorLog {\r\n\tget-button OK | click\r\n} | assert-empty"
+		   });
 		addAnnotation
-		  (getListen_Source(), 
-		   source, 
+		  (getListen_Source(),
+		   source,
 		   new String[] {
-			 "description", "Source to listen for, for example, <code>errorLog</code>."
-		   });	
+			   "description", "Source to listen for, for example, <code>errorLog</code>."
+		   });
 		addAnnotation
-		  (getListen_While(), 
-		   source, 
+		  (getListen_While(),
+		   source,
 		   new String[] {
-			 "description", "Commands to execute while listening for the source."
-		   });	
+			   "description", "Commands to execute while listening for the source."
+		   });
 		addAnnotation
-		  (valEClass, 
-		   source, 
+		  (valEClass,
+		   source,
 		   new String[] {
-			 "description", "Creates a new variable declaration. This command can be used only with <a href=\"#let\">let</a> and <a href=\"#proc\">proc</a>.",
-			 "returns", "An internal object, describing a variable",
-			 "example", "let [val button [get-button OK]] {\n    $button | click\n}"
-		   });	
+			   "description", "Creates a new variable declaration. This command can be used only with <a href=\"#let\">let</a> and <a href=\"#proc\">proc</a>.",
+			   "returns", "An internal object, describing a variable",
+			   "example", "let [val button [get-button OK]] {\n    $button | click\n}"
+		   });
 		addAnnotation
-		  (getVal_Name(), 
-		   source, 
+		  (getVal_Name(),
+		   source,
 		   new String[] {
-			 "description", "Variable name. Later this name can be used to refer to a variable value by prepending a dollar sign, i.e. $varName. If variable with the same name already defined in outer scope, then it will be hidden by inner variable with the same name."
-		   });	
+			   "description", "Variable name. Later this name can be used to refer to a variable value by prepending a dollar sign, i.e. $varName. If variable with the same name already defined in outer scope, then it will be hidden by inner variable with the same name."
+		   });
 		addAnnotation
-		  (getVal_Value(), 
-		   source, 
+		  (getVal_Value(),
+		   source,
 		   new String[] {
-			 "description", "Variable value. When variable is defined in <a href=\"#proc\">proc</a> block, this value denotes the default parameter value."
-		   });	
+			   "description", "Variable value. When variable is defined in <a href=\"#proc\">proc</a> block, this value denotes the default parameter value."
+		   });
 		addAnnotation
-		  (getVal_Input(), 
-		   source, 
+		  (getVal_Input(),
+		   source,
 		   new String[] {
-			 "description", "An option to indicate that variable value should be taken from input pipe. "
-		   });	
+			   "description", "An option to indicate that variable value should be taken from input pipe. "
+		   });
 		addAnnotation
-		  (getValEClass, 
-		   source, 
+		  (getValEClass,
+		   source,
 		   new String[] {
-			 "description", "Returns variable value by its name. Syntax sugar form <code>$name</code> can be used instead."
-		   });	
+			   "description", "Returns variable value by its name. Syntax sugar form <code>$name</code> can be used instead."
+		   });
 		addAnnotation
-		  (letEClass, 
-		   source, 
+		  (letEClass,
+		   source,
 		   new String[] {
-			 "description", "Defines variables and evaluates <code>body</code> script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has <code>-input</code> flag, then <code>let</code> command must be used in a pipeline (see example 2). ",
-			 "returns", "An output of a <code>body</code> script",
-			 "example", "// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n"
-		   });	
+			   "description", "Defines variables and evaluates <code>body</code> script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has <code>-input</code> flag, then <code>let</code> command must be used in a pipeline (see example 2). ",
+			   "returns", "An output of a <code>body</code> script",
+			   "example", "// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n"
+		   });
 		addAnnotation
-		  (getLet_Vals(), 
-		   source, 
+		  (getLet_Vals(),
+		   source,
 		   new String[] {
-			 "description", "List of variables"
-		   });	
+			   "description", "List of variables"
+		   });
 		addAnnotation
-		  (getLet_Body(), 
-		   source, 
+		  (getLet_Body(),
+		   source,
 		   new String[] {
-			 "description", "Script to be executed"
-		   });	
+			   "description", "Script to be executed"
+		   });
 		addAnnotation
-		  (procEClass, 
-		   source, 
+		  (procEClass,
+		   source,
 		   new String[] {
-			 "description", "Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.",
-			 "returns", "An output of a <code>body</code> script",
-			 "example", "// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\""
-		   });	
+			   "description", "Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.",
+			   "returns", "An output of a <code>body</code> script",
+			   "example", "// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\""
+		   });
 		addAnnotation
-		  (getProc_Name(), 
-		   source, 
+		  (getProc_Name(),
+		   source,
 		   new String[] {
-			 "description", "Procedure name. Must be unique in a context of current ECL session"
-		   });	
+			   "description", "Procedure name. Must be unique in a context of current ECL session"
+		   });
 		addAnnotation
-		  (procInstanceEClass, 
-		   source, 
+		  (procInstanceEClass,
+		   source,
 		   new String[] {
-			 "description", "Marker superclass for user-defined procs"
-		   });	
+			   "description", "Marker superclass for user-defined procs"
+		   });
 		addAnnotation
-		  (globalEClass, 
-		   source, 
+		  (globalEClass,
+		   source,
 		   new String[] {
-			 "description", "Creates a new global variable declaration.",
-			 "returns", "An internal object, describing a variable",
-			 "example", "// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}"
-		   });	
+			   "description", "Creates a new global variable declaration.",
+			   "returns", "An internal object, describing a variable",
+			   "example", "// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}"
+		   });
 		addAnnotation
-		  (getEClass, 
-		   source, 
+		  (getEClass,
+		   source,
 		   new String[] {
-			 "description", "Depending on input object, either returns a value by key from <a href=\"#map\">map</a>, or element by index from <a href=\"#list\">list</a>, or member of EMF object by name.",
-			 "example", "//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log"
-		   });	
+			   "description", "Depending on input object, either returns a value by key from <a href=\"#map\">map</a>, or element by index from <a href=\"#list\">list</a>, or member of EMF object by name.",
+			   "example", "//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log"
+		   });
 		addAnnotation
-		  (getGet_Input(), 
-		   source, 
+		  (getGet_Input(),
+		   source,
 		   new String[] {
-			 "description", "Object to get a value from"
-		   });	
+			   "description", "Object to get a value from"
+		   });
 		addAnnotation
-		  (getGet_Key(), 
-		   source, 
+		  (getGet_Key(),
+		   source,
 		   new String[] {
-			 "description", "Depending on an input object either a key in a map, or index in a list, or name of a feature/attribute of EMF object"
-		   });	
+			   "description", "Depending on an input object either a key in a map, or index in a list, or name of a feature/attribute of EMF object"
+		   });
 		addAnnotation
-		  (getGet_Default(), 
-		   source, 
+		  (getGet_Default(),
+		   source,
 		   new String[] {
-			 "description", "Value to return if input object does not contain value by requested key"
-		   });	
+			   "description", "Value to return if input object does not contain value by requested key"
+		   });
 		addAnnotation
-		  (caseEClass, 
-		   source, 
+		  (caseEClass,
+		   source,
 		   new String[] {
-			 "description", "Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.",
-			 "returns", "An internal object describing the case.",
-			 "example", "list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]"
-		   });	
+			   "description", "Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.",
+			   "returns", "An internal object describing the case.",
+			   "example", "list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]"
+		   });
 		addAnnotation
-		  (getCase_Condition(), 
-		   source, 
+		  (getCase_Condition(),
+		   source,
 		   new String[] {
-			 "description", "Object used to match to the <code>input</code>. Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
-		   });	
+			   "description", "Object used to match to the <code>input</code>. Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
+		   });
 		addAnnotation
-		  (getCase_Then(), 
-		   source, 
+		  (getCase_Then(),
+		   source,
 		   new String[] {
-			 "description", "Branch being executed when <code>input</code> matches the object specified in <code>condition</code>"
-		   });	
+			   "description", "Branch being executed when <code>input</code> matches the object specified in <code>condition</code>"
+		   });
 		addAnnotation
-		  (switchEClass, 
-		   source, 
+		  (switchEClass,
+		   source,
 		   new String[] {
-			 "description", "Reads object from input pipe or <code>input</code> parameter and executes a <code>case</code> part with matching <code>condition</code> parameter (if any) sending <code>input</code> parameter as an input. If no <code>case</code> matched, the <code>default<code> block (if any) will be executed.",
-			 "returns", "An output of executed block (<code>case</code> command or <code>-default</code> block). If nothing is executed, no output will be produced.",
-			 "example", "list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n"
-		   });	
+			   "description", "Reads object from input pipe or <code>input</code> parameter and executes a <code>case</code> part with matching <code>condition</code> parameter (if any) sending <code>input</code> parameter as an input. If no <code>case</code> matched, the <code>default<code> block (if any) will be executed.",
+			   "returns", "An output of executed block (<code>case</code> command or <code>-default</code> block). If nothing is executed, no output will be produced.",
+			   "example", "list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n"
+		   });
 		addAnnotation
-		  (getSwitch_Input(), 
-		   source, 
+		  (getSwitch_Input(),
+		   source,
 		   new String[] {
-			 "description", "The input object to match."
-		   });	
+			   "description", "The input object to match."
+		   });
 		addAnnotation
-		  (getSwitch_Items(), 
-		   source, 
+		  (getSwitch_Items(),
+		   source,
 		   new String[] {
-			 "description", "One or more <code>case</code> blocks. Block with a condition matching the input will be executed."
-		   });	
+			   "description", "One or more <code>case</code> blocks. Block with a condition matching the input will be executed."
+		   });
 		addAnnotation
-		  (getSwitch_Default(), 
-		   source, 
+		  (getSwitch_Default(),
+		   source,
 		   new String[] {
-			 "description", "Optional parameter. The block which will be executed in case no <code>case</code> block is executed."
+			   "description", "Optional parameter. The block which will be executed in case no <code>case</code> block is executed."
 		   });
 	}
 
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java
index c01e15f..d2e9660 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(boolean newValue) {
 		boolean oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java
index a5711c6..f18df29 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public byte getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(byte newValue) {
 		byte oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java
index 8a23f63..5b68165 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public char getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(char newValue) {
 		char oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java
index fc410ee..fe6e4fe 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(double newValue) {
 		double oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java
index 4393463..912a2208 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java
@@ -26,6 +26,7 @@
 import org.eclipse.rcptt.ecl.core.CorePackage;
 import org.eclipse.rcptt.ecl.core.EclException;
 import org.eclipse.rcptt.ecl.core.EclStackTraceEntry;
+import org.eclipse.rcptt.ecl.core.ProcessStatus;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,6 +41,7 @@
  *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getStackTrace <em>Stack Trace</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getThrowable <em>Throwable</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getCause <em>Cause</em>}</li>
+ *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getStatus <em>Status</em>}</li>
  * </ul>
  *
  * @generated
@@ -126,6 +128,16 @@
 	protected EclException cause;
 
 	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected ProcessStatus status;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -149,6 +161,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getClassName() {
 		return className;
 	}
@@ -158,6 +171,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setClassName(String newClassName) {
 		String oldClassName = className;
 		className = newClassName;
@@ -170,6 +184,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getMessage() {
 		return message;
 	}
@@ -179,6 +194,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMessage(String newMessage) {
 		String oldMessage = message;
 		message = newMessage;
@@ -191,6 +207,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclStackTraceEntry> getStackTrace() {
 		if (stackTrace == null) {
 			stackTrace = new EObjectContainmentEList<EclStackTraceEntry>(EclStackTraceEntry.class, this, CorePackage.ECL_EXCEPTION__STACK_TRACE);
@@ -203,6 +220,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Throwable getThrowable() {
 		return throwable;
 	}
@@ -212,6 +230,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setThrowable(Throwable newThrowable) {
 		Throwable oldThrowable = throwable;
 		throwable = newThrowable;
@@ -224,6 +243,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclException getCause() {
 		return cause;
 	}
@@ -248,6 +268,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCause(EclException newCause) {
 		if (newCause != cause) {
 			NotificationChain msgs = null;
@@ -268,12 +289,59 @@
 	 * @generated
 	 */
 	@Override
+	public ProcessStatus getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetStatus(ProcessStatus newStatus, NotificationChain msgs) {
+		ProcessStatus oldStatus = status;
+		status = newStatus;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CorePackage.ECL_EXCEPTION__STATUS, oldStatus, newStatus);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStatus(ProcessStatus newStatus) {
+		if (newStatus != status) {
+			NotificationChain msgs = null;
+			if (status != null)
+				msgs = ((InternalEObject)status).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CorePackage.ECL_EXCEPTION__STATUS, null, msgs);
+			if (newStatus != null)
+				msgs = ((InternalEObject)newStatus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CorePackage.ECL_EXCEPTION__STATUS, null, msgs);
+			msgs = basicSetStatus(newStatus, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.ECL_EXCEPTION__STATUS, newStatus, newStatus));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case CorePackage.ECL_EXCEPTION__STACK_TRACE:
 				return ((InternalEList<?>)getStackTrace()).basicRemove(otherEnd, msgs);
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				return basicSetCause(null, msgs);
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				return basicSetStatus(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -296,6 +364,8 @@
 				return getThrowable();
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				return getCause();
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				return getStatus();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -325,6 +395,9 @@
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				setCause((EclException)newValue);
 				return;
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				setStatus((ProcessStatus)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -352,6 +425,9 @@
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				setCause((EclException)null);
 				return;
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				setStatus((ProcessStatus)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -374,6 +450,8 @@
 				return THROWABLE_EDEFAULT == null ? throwable != null : !THROWABLE_EDEFAULT.equals(throwable);
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				return cause != null;
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				return status != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -387,7 +465,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (className: ");
 		result.append(className);
 		result.append(", message: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java
index 1cb5708..e3f29fd 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public float getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(float newValue) {
 		float oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java
index 6d7b473..7465ee0 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(int newValue) {
 		int oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java
index b5abf4d..649a03a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java
@@ -76,6 +76,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EObject> getElements() {
 		if (elements == null) {
 			elements = new EObjectContainmentEList<EObject>(EObject.class, this, CorePackage.ECL_LIST__ELEMENTS);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java
index 7b01c2f..66b2fd9 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(long newValue) {
 		long oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java
index 2eac479..3694474 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java
@@ -169,6 +169,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getKey() {
 		return key;
 	}
@@ -193,6 +194,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setKey(EObject newKey) {
 		if (newKey != key) {
 			NotificationChain msgs = null;
@@ -212,6 +214,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getValue() {
 		return value;
 	}
@@ -236,6 +239,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(EObject newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java
index e5cba23..d466143 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java
@@ -79,6 +79,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclMapEntry> getEntries() {
 		if (entries == null) {
 			entries = new EObjectContainmentEList<EclMapEntry>(EclMapEntry.class, this, CorePackage.ECL_MAP__ENTRIES);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java
index d3e34d2..5438f75 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public short getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(short newValue) {
 		short oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java
index 81d7985..afea63d 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java
@@ -183,6 +183,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getIndex() {
 		return index;
 	}
@@ -192,6 +193,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIndex(int newIndex) {
 		int oldIndex = index;
 		index = newIndex;
@@ -204,6 +206,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getDeclaringClass() {
 		return declaringClass;
 	}
@@ -213,6 +216,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDeclaringClass(String newDeclaringClass) {
 		String oldDeclaringClass = declaringClass;
 		declaringClass = newDeclaringClass;
@@ -225,6 +229,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getMethodName() {
 		return methodName;
 	}
@@ -234,6 +239,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMethodName(String newMethodName) {
 		String oldMethodName = methodName;
 		methodName = newMethodName;
@@ -246,6 +252,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getFileName() {
 		return fileName;
 	}
@@ -255,6 +262,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFileName(String newFileName) {
 		String oldFileName = fileName;
 		fileName = newFileName;
@@ -267,6 +275,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getLineNumber() {
 		return lineNumber;
 	}
@@ -276,6 +285,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLineNumber(int newLineNumber) {
 		int oldLineNumber = lineNumber;
 		lineNumber = newLineNumber;
@@ -288,6 +298,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isNativeMethod() {
 		return nativeMethod;
 	}
@@ -297,6 +308,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setNativeMethod(boolean newNativeMethod) {
 		boolean oldNativeMethod = nativeMethod;
 		nativeMethod = newNativeMethod;
@@ -421,7 +433,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (index: ");
 		result.append(index);
 		result.append(", declaringClass: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java
index 75839a9..7762ac5 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java
index 98b5c52..ba9f6f1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java
@@ -119,6 +119,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getNamespace() {
 		return namespace;
 	}
@@ -128,6 +129,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setNamespace(String newNamespace) {
 		String oldNamespace = namespace;
 		namespace = newNamespace;
@@ -140,6 +142,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -149,6 +152,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -161,6 +165,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Parameter> getParameters() {
 		if (parameters == null) {
 			parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, CorePackage.EXEC__PARAMETERS);
@@ -271,7 +276,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (namespace: ");
 		result.append(namespace);
 		result.append(", name: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java
index 45c69d1..e4aadb2 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java
@@ -70,6 +70,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getCommand() {
 		return command;
 	}
@@ -94,6 +95,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCommand(Command newCommand) {
 		if (newCommand != command) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java
index 3be3a1d..333e986 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java
@@ -101,6 +101,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Val getItem() {
 		return item;
 	}
@@ -125,6 +126,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setItem(Val newItem) {
 		if (newItem != item) {
 			NotificationChain msgs = null;
@@ -144,6 +146,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Val getIndex() {
 		if (index != null && index.eIsProxy()) {
 			InternalEObject oldIndex = (InternalEObject)index;
@@ -170,6 +173,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIndex(Val newIndex) {
 		Val oldIndex = index;
 		index = newIndex;
@@ -181,6 +185,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getDo() {
 		return do_;
 	}
@@ -203,6 +208,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDo(Command newDo) {
 		if (newDo != do_) {
 			NotificationChain msgs = null;
@@ -221,6 +227,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EObject> getInput() {
 		if (input == null) {
 			input = new EObjectResolvingEList<EObject>(EObject.class, this, CorePackage.FOREACH__INPUT);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java
index 8d4610e..f2e1285 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java
@@ -92,6 +92,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getInput() {
 		return input;
 	}
@@ -116,6 +117,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInput(EObject newInput) {
 		if (newInput != input) {
 			NotificationChain msgs = null;
@@ -135,6 +137,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getKey() {
 		return key;
 	}
@@ -159,6 +162,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setKey(EObject newKey) {
 		if (newKey != key) {
 			NotificationChain msgs = null;
@@ -178,6 +182,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getDefault() {
 		return default_;
 	}
@@ -202,6 +207,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDefault(EObject newDefault) {
 		if (newDefault != default_) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java
index dcfab07..155e068 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java
index 66b642c..6f08a5c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java
@@ -96,6 +96,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.GLOBAL__VALS);
@@ -108,6 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isOverride() {
 		return override;
 	}
@@ -117,6 +119,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOverride(boolean newOverride) {
 		boolean oldOverride = override;
 		override = newOverride;
@@ -217,7 +220,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (override: ");
 		result.append(override);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java
index 95e1cfd..b3cfb1c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java
@@ -93,6 +93,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getCondition() {
 		if (condition != null && condition.eIsProxy()) {
 			InternalEObject oldCondition = (InternalEObject)condition;
@@ -119,6 +120,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCondition(EObject newCondition) {
 		EObject oldCondition = condition;
 		condition = newCondition;
@@ -131,6 +133,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getThen() {
 		return then;
 	}
@@ -155,6 +158,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setThen(Command newThen) {
 		if (newThen != then) {
 			NotificationChain msgs = null;
@@ -174,6 +178,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getElse() {
 		return else_;
 	}
@@ -198,6 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElse(Command newElse) {
 		if (newElse != else_) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java
index 58aa335..0083e20 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java
@@ -89,6 +89,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.LET__VALS);
@@ -101,6 +102,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getBody() {
 		return body;
 	}
@@ -125,6 +127,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBody(Command newBody) {
 		if (newBody != body) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java
index 4a74a31..83a3c02 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java
@@ -90,6 +90,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getSource() {
 		return source;
 	}
@@ -99,6 +100,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSource(String newSource) {
 		String oldSource = source;
 		source = newSource;
@@ -111,6 +113,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getWhile() {
 		if (while_ != null && while_.eIsProxy()) {
 			InternalEObject oldWhile = (InternalEObject)while_;
@@ -137,6 +140,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setWhile(Command newWhile) {
 		Command oldWhile = while_;
 		while_ = newWhile;
@@ -222,7 +226,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (source: ");
 		result.append(source);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java
index 8493118..e11ee52 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java
@@ -98,6 +98,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 		return literal;
 	}
@@ -107,6 +108,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLiteral(String newLiteral) {
 		String oldLiteral = literal;
 		literal = newLiteral;
@@ -119,6 +121,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getFormat() {
 		return format;
 	}
@@ -128,6 +131,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFormat(String newFormat) {
 		String oldFormat = format;
 		format = newFormat;
@@ -212,7 +216,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (literal: ");
 		result.append(literal);
 		result.append(", format: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
index bba339a..0c6dd6e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
@@ -92,6 +92,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getValue() {
 		return value;
 	}
@@ -116,6 +117,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(EObject newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
@@ -135,6 +137,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getType() {
 		return type;
 	}
@@ -144,6 +147,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setType(String newType) {
 		String oldType = type;
 		type = newType;
@@ -242,7 +246,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (type: ");
 		result.append(type);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java
index 3571e7e..2393994 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java
@@ -78,6 +78,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -87,6 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -161,7 +163,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java
index 256ff22..8b88d95 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java
@@ -110,6 +110,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -119,6 +120,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -131,6 +133,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.PROC__VALS);
@@ -143,6 +146,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getBody() {
 		return body;
 	}
@@ -167,6 +171,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBody(Command newBody) {
 		if (newBody != body) {
 			NotificationChain msgs = null;
@@ -286,7 +291,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java
index a6ac229..28ac19f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java
@@ -69,6 +69,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Proc getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
 			InternalEObject oldDefinition = (InternalEObject)definition;
@@ -95,6 +96,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDefinition(Proc newDefinition) {
 		Proc oldDefinition = definition;
 		definition = newDefinition;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java
index 39f4ca0..c551626 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java
@@ -170,6 +170,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPluginId() {
 		return pluginId;
 	}
@@ -179,6 +180,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPluginId(String newPluginId) {
 		String oldPluginId = pluginId;
 		pluginId = newPluginId;
@@ -191,6 +193,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getCode() {
 		return code;
 	}
@@ -200,6 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCode(int newCode) {
 		int oldCode = code;
 		code = newCode;
@@ -212,6 +216,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getMessage() {
 		return message;
 	}
@@ -221,6 +226,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMessage(String newMessage) {
 		String oldMessage = message;
 		message = newMessage;
@@ -233,6 +239,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getSeverity() {
 		return severity;
 	}
@@ -242,6 +249,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSeverity(int newSeverity) {
 		int oldSeverity = severity;
 		severity = newSeverity;
@@ -254,6 +262,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclException getException() {
 		return exception;
 	}
@@ -278,6 +287,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setException(EclException newException) {
 		if (newException != exception) {
 			NotificationChain msgs = null;
@@ -297,6 +307,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ProcessStatus> getChildren() {
 		if (children == null) {
 			children = new EObjectContainmentEList<ProcessStatus>(ProcessStatus.class, this, CorePackage.PROCESS_STATUS__CHILDREN);
@@ -439,7 +450,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (pluginId: ");
 		result.append(pluginId);
 		result.append(", code: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java
index 1d48c16..2251dc1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java
@@ -70,6 +70,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SessionState getState() {
 		return state;
 	}
@@ -94,6 +95,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setState(SessionState newState) {
 		if (newState != state) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java
index 4c61ba8..9e8c849 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getContent() {
 		return content;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setContent(String newContent) {
 		String oldContent = content;
 		content = newContent;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (content: ");
 		result.append(content);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
index 46ab313..656c84f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
@@ -78,6 +78,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public byte[] getBytes() {
 		return bytes;
 	}
@@ -87,6 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBytes(byte[] newBytes) {
 		byte[] oldBytes = bytes;
 		bytes = newBytes;
@@ -161,7 +163,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (bytes: ");
 		result.append(bytes);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java
index b2a5b8f..95bc63b 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java
@@ -88,6 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Proc> getProcs() {
 		if (procs == null) {
 			procs = new EObjectContainmentEList<Proc>(Proc.class, this, CorePackage.SESSION_STATE__PROCS);
@@ -100,6 +101,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getDecls() {
 		if (decls == null) {
 			decls = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.SESSION_STATE__DECLS);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java
index 98ba061..e78dc75 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java
@@ -103,6 +103,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Case> getItems() {
 		if (items == null) {
 			items = new EObjectContainmentEList<Case>(Case.class, this, CorePackage.SWITCH__ITEMS);
@@ -115,6 +116,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getDefault() {
 		return default_;
 	}
@@ -139,6 +141,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDefault(Command newDefault) {
 		if (newDefault != default_) {
 			NotificationChain msgs = null;
@@ -158,6 +161,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getInput() {
 		if (input != null && input.eIsProxy()) {
 			InternalEObject oldInput = (InternalEObject)input;
@@ -184,6 +188,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInput(EObject newInput) {
 		EObject oldInput = input;
 		input = newInput;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java
index b657599..40edfa4 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java
@@ -111,6 +111,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -120,6 +121,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -132,6 +134,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isInput() {
 		return input;
 	}
@@ -141,6 +144,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInput(boolean newInput) {
 		boolean oldInput = input;
 		input = newInput;
@@ -153,6 +157,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getValue() {
 		if (value != null && value.eIsProxy()) {
 			InternalEObject oldValue = (InternalEObject)value;
@@ -179,6 +184,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(EObject newValue) {
 		EObject oldValue = value;
 		value = newValue;
@@ -274,7 +280,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", input: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java
index 7338216..1dc6d53 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java
@@ -82,6 +82,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getObject() {
 		return object;
 	}
@@ -106,6 +107,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setObject(EObject newObject) {
 		if (newObject != object) {
 			NotificationChain msgs = null;
@@ -125,6 +127,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getDo() {
 		return do_;
 	}
@@ -149,6 +152,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDo(Command newDo) {
 		if (newDo != do_) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/util/ProcessStatuses.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/util/ProcessStatuses.java
new file mode 100644
index 0000000..751778d
--- /dev/null
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/util/ProcessStatuses.java
@@ -0,0 +1,18 @@
+package org.eclipse.rcptt.ecl.core.util;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.rcptt.ecl.core.ProcessStatus;
+import org.eclipse.rcptt.ecl.internal.core.ProcessStatusConverter;
+
+public final class ProcessStatuses {
+	private ProcessStatuses() {}
+	
+	public static ProcessStatus adapt(IStatus status) {
+		return ProcessStatusConverter.toProcessStatus(status);
+	}
+	
+	public static IStatus adapt(ProcessStatus status) {
+		return ProcessStatusConverter.toIStatus(status);
+	}
+
+}
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java
index db5cb82..87f058f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java
@@ -11,7 +11,9 @@
 package org.eclipse.rcptt.ecl.internal.core;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Objects;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
@@ -65,52 +67,58 @@
 	}
 
 	public static Throwable getThrowable(EclException exception) {
+		if (exception == null)
+			return null;
 		Throwable th = null;
 		try {
 			// Try to restore stored exception.
 			th = exception.getThrowable();
+			if (!Objects.equals(th.getClass().getName(), exception.getClassName())) {
+				throw new IllegalStateException(String.format("Bad class, expected: %s, actual: %s ", exception.getClassName(), th.getClass().getName()));
+			}
 		} catch (Throwable ee) {
 			// Failed to restore exception, try to construct new one
 			try {
 				String className = exception.getClassName();
 				Class<?> forName = Class.forName(className);
-				if (forName != null) {
+				try {
 					Constructor<?> constructor = forName.getConstructor(
 							String.class, Throwable.class);
-					if (constructor != null) {
-						Throwable newInstance = (Throwable) constructor
-								.newInstance(exception.getMessage(), null);
-						if (newInstance != null) {
-							EList<EclStackTraceEntry> list = exception
-									.getStackTrace();
-							if (list.size() > 0) {
-								newInstance.setStackTrace(constructStack(list));
-								th = newInstance;
-							}
-						}
-					}
+					Throwable newInstance = (Throwable) constructor
+							.newInstance(exception.getMessage(), getThrowable(exception.getCause()));
+					th = newInstance;
+				} catch (NoSuchMethodException  e) {
+					if (exception.getStatus() == null)
+						throw e;
+					Constructor<?> constructor = forName.getConstructor(IStatus.class);
+					Throwable newInstance = (Throwable) constructor
+							.newInstance(toIStatus(exception.getStatus()));
+					th = newInstance;
+					th.addSuppressed(e);
 				}
-			} catch (Throwable eee) {
-				Exception newex = new Exception(exception.getMessage(), null);
-				EList<EclStackTraceEntry> list = exception.getStackTrace();
-				if (list.size() > 0) {
-					newex.setStackTrace(constructStack(list));
-					th = newex;
+				th.addSuppressed(ee);
+			} catch (Exception eee) {
+				if (exception.getStatus() != null) {
+					th = new CoreException(toIStatus(exception.getStatus()));
+				} else {
+					th = new Exception(exception.getMessage(), getThrowable(exception.getCause()));
 				}
+				th.addSuppressed(eee);
 			}
 		}
 		if (th != null) {
-			EList<EclStackTraceEntry> list = exception.getStackTrace();
-			if (list.size() > 0) {
-				th.setStackTrace(constructStack(list));
-			}
-		}
-		if (exception.getCause() != null) {
-			th.initCause(getThrowable(exception.getCause()));
+			copyAttributesFromEObject(exception, th);
 		}
 		return th;
 	}
 
+	private static void copyAttributesFromEObject(EclException exception, Throwable newInstance) {
+		EList<EclStackTraceEntry> list = exception.getStackTrace();
+		if (list.size() > 0) {
+			newInstance.setStackTrace(constructStack(list));
+		}
+	}
+
 	private static StackTraceElement[] constructStack(EList<EclStackTraceEntry> list) {
 		StackTraceElement[] stack = new StackTraceElement[list.size()];
 		for (int i = 0; i < list.size(); i++) {
@@ -207,6 +215,9 @@
 		if (cause != null) {
 			ex.setCause(toException(cause));
 		}
+		if (exception instanceof CoreException) {
+			ex.setStatus(toProcessStatus(((CoreException) exception).getStatus()));
+		}
 		return ex;
 	}
 }
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF
index 558c156..4c569ea 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data.apache.poi;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ecl.data.apache.poi.commands.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.data;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.data;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.data.apache.poi;visibility:=reexport,
- org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml
index abe04f7..6c6a050 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data.apache.poi</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF
index fdfcaba..a5ec9c7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,8 +16,8 @@
  org.eclipse.rcptt.ecl.data.objects.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.data;visibility:=reexport,
- org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml
index ec9c75a..9b01485 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF
index 21ef92e..27fc855 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: ECL Debug Core
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.debug.core;singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)"
 Export-Package: org.eclipse.rcptt.ecl.debug.core,
  org.eclipse.rcptt.ecl.internal.debug.core
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml
index 40cbafb..5137db9 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.debug.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF
index f124d5f..3a29b0a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.debug.runtime;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,7 +17,7 @@
  org.eclipse.rcptt.ecl.internal.debug.runtime
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ecl.internal.debug.runtime.EclDebugRuntimePlugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml
index 45b5ba6..5d1c050 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.debug.runtime</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF
index 8bef763..62b11b2 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.debug.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.debug.ui.EclDebugUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.ide,
  org.eclipse.jface.text,
  org.eclipse.ui.editors
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml
index 278a328..db12d07 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.debug.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF
index 4b1edce..0cc9f24 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Multi-Dispatching Mechanism
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.dispatch;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Export-Package: org.eclipse.rcptt.ecl.dispatch
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml
index 8a99d44..2708923 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.dispatch</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF
index c227eea..09cd9dd 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Documentation
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.doc;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.doc.EclDocPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.doc
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml
index 663b5a2..422f9c4 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.doc</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF
index faabbed..bead034 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.filesystem;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ecl.filesystem.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.filesystem;resolution:=optional,
  org.eclipse.core.resources;resolution:=optional
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml
index 2c019c4..d34f373 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.filesystem</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF
index 697b51e..74e3600 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.interop;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ecl.interop,
  org.eclipse.rcptt.ecl.interop.impl,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml
index 54a1b4f..6fad034 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.interop</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF
index 96e4780..814af07 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.operations;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@
  org.eclipse.rcptt.ecl.operations.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml
index c31176c..2b8ee61 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.operations</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF
index e441cea..920ac2a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.parser;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.antlr.runtime;bundle-version="[3.2.0,3.3.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ecl.gen.ast,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml
index 2c05eff..33ea882 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.parser</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF
index ecf512d..00991e2 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.perf;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,6 +12,6 @@
  org.eclipse.rcptt.ecl.perf.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ecl.perf.internal.EclPerfPlugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml
index d4adaf8..df3f52c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.perf</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF
index ca2b4e9..13088f1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.platform.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ecl.platform.ui.commands.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.platform.ui;visibility:=reexport,
  org.eclipse.ui,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml
index c925fef..bdb562a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.platform.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF
index 79cf078..be88241 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.platform;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,8 +16,8 @@
  org.eclipse.rcptt.ecl.platform.objects.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.core;resolution:=optional,
  org.eclipse.equinox.p2.repository;resolution:=optional,
  org.eclipse.equinox.p2.metadata;resolution:=optional,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml
index a096ef5..f5b9978 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.platform</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF
index 6bed22d..cc90888 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Console
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.popup.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.popup.ui.internal.EclPopupUIPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.console,
- org.eclipse.rcptt.ecl.popup;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.popup;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml
index 74515d4..0d71522 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.popup.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF
index 45fbb19..4c448b1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Console Code Plug-in
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.popup
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.popup.EclPopupPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ecl.popup
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml
index f6a3cff..ae26175 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.popup</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF
index 99fe6f6..622f645 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL TCP Server UI
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.server.tcp.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.internal.server.tcp.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml
index 650e72c..ca3253e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.server.tcp.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF
index 25fd46c..5b4549e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL TCP Server
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.server.tcp;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.internal.server.tcp.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.rcptt.ecl.internal.server.tcp,
  org.eclipse.rcptt.ecl.server.tcp
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml
index 7b97fae..c2f3d2b 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.server.tcp</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java
index d6ee8b4..a2512f7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.rcptt.ecl.server.tcp;

 

+import java.io.Closeable;
 import java.io.IOException;

 import java.net.ServerSocket;

 import java.net.Socket;

@@ -36,21 +37,21 @@
 	@Override

 	public void run() {

 		starting = false;

-		try {

+		try (Closeable closeable = socket) {

 			while (!isInterrupted()) {

 				try {

 					Socket client = socket.accept();

 					//client.setKeepAlive(true);

 					client.setTcpNoDelay(true);

 					manager.acceptNewConnection(client);

-				} catch (Exception e) {

-					CorePlugin.log(CorePlugin.err(

-							"Failed to accept connection", e));

+				} catch (Exception e) {
+					if (!socket.isClosed()) {

+						CorePlugin.log(CorePlugin.err(

+								"Failed to accept connection", e));
+					}

 				}

 			}

-			if (socket != null) {

-				socket.close();

-			}

+			socket.close();

 		} catch (Exception e) {

 			CorePlugin.log(CorePlugin.err("Failed to start ECL TCP server", e));

 		}

@@ -58,5 +59,16 @@
 

 	public int getPort() {

 		return port;

+	}
+	
+	@Override
+	public void interrupt() {
+		try {
+			socket.close();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		} finally {
+			super.interrupt();
+		}
 	}

 }

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java
index 2dd4307..81e83f5 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java
@@ -48,7 +48,15 @@
 	public synchronized void stopServer(int port) throws IOException {

 		EclTcpServer server = servers.remove(port);

 		if (server != null) {

-			server.interrupt();

+			server.interrupt();
+			try {
+				server.join(10000);
+				if (server.isAlive())
+					throw new IOException("Failed to stop " + server);
+			} catch (InterruptedException e) {
+				Thread.currentThread().interrupt();
+				throw new IOException("Failed to stop server", e);
+			}

 		} else {

 			throw new IOException("No server found on port " + port);

 		}

@@ -59,12 +67,17 @@
 	}

 

 	public synchronized void terminateAll() {

-		HashSet<Integer> ports = new HashSet<Integer>(servers.keySet());

+		HashSet<Integer> ports = new HashSet<Integer>(servers.keySet());
+		IOException result = null;

 		for (int i : ports) {

 			try {

 				stopServer(i);

-			} catch (IOException e) {

-				e.printStackTrace();

+			} catch (IOException e) {
+				if (result == null) {
+					result = e;
+				} else {
+					result.addSuppressed(e);
+				}

 			}

 		}

 	}

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java
index bcc3dce..738f05d 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java
@@ -31,18 +31,13 @@
 		this.useJobs = useJobs;

 	}

 

-	public void acceptNewConnection(Socket client) {

-		try {

-			count++;

-			String uuid = initRecover(client);

-			if (uuid != null) {

-				executor.execute(new SessionRequestHandler(client, useJobs));

-			} else {

-				client.close();

-			}

-

-		} catch (Throwable e) {

-			CorePlugin.log(e);

+	public void acceptNewConnection(Socket client) throws IOException {

+		count++;

+		String uuid = initRecover(client);

+		if (uuid != null) {

+			executor.execute(new SessionRequestHandler(client, useJobs));

+		} else {

+			client.close();

 		}

 	}

 

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF
index 54acaf9..8f48d13 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Shell
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.shell
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.eclsh.EclPlugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.eclsh
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml
index 493528e..e959f9c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.shell</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF
index 0543730..f93173c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Telnet UI configuration
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.telnet.server.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.telnet.server.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.telnet.server;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.telnet.server;bundle-version="[2.5.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml
index 8322cc1..e184647 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.telnet.server.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF
index dcb81b0..34c894f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Telnet Server
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.telnet.server;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.telnet.server.EclTelnetServerPlugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.shell;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.shell;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.telnet.server
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml
index c8f7767..d9514ab 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.telnet.server</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/pom.xml b/ecl/plugins/pom.xml
index 80ba159..35f4f36 100644
--- a/ecl/plugins/pom.xml
+++ b/ecl/plugins/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>    
   </parent>
   <modules>
diff --git a/ecl/repository/pom.xml b/ecl/repository/pom.xml
index 50ad81e..9be2b56 100644
--- a/ecl/repository/pom.xml
+++ b/ecl/repository/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>
   </parent>
   <artifactId>ecl-repository</artifactId>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath
index ad32c83..0c22b5d 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project
index b6f7b92..2015498 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1559806763699</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF
index 17ce459..f466fed 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,20 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: ECL TCP Client Tests
-Bundle-SymbolicName: org.eclipse.rcptt.ecl.client.tcp.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rcptt.ecl.client.tcp.tests;singleton:=true
+Automatic-Module-Name: org.eclipse.rcptt.ecl.client.tcp.tests
+Bundle-Version: 2.5.0.qualifier
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
  org.junit;bundle-version="3.8.2",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core.tests;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)"
+ com.google.guava,
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core.tests;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.rcptt.ecl.internal.client.tcp.tests
-Bundle-Vendor: Eclipse RCP Testing Tool Project
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties
index 4b047e9..86f0d1a 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties
@@ -8,9 +8,10 @@
 # Contributors:
 #     Xored Software Inc - initial API and implementation and/or initial documentation
 ###############################################################################
-source.. = src/
+source.. = src/,\
+           src-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               test.xml,\
-               about.html
+               about.html,\
+               plugin.xml
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.ecore b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.ecore
new file mode 100644
index 0000000..c63ee14
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.ecore
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tests" nsURI="http://www.eclipse.org/ecl/testcommands.ecore"
+    nsPrefix="org.eclipse.rcptt.ecl.client.tcp.tests">
+  <eClassifiers xsi:type="ecore:EClass" name="EclInjectedCommand" eSuperTypes="../../org.eclipse.rcptt.ecl.core/model/ecl.ecore#//Command"/>
+</ecore:EPackage>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.genmodel b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.genmodel
new file mode 100644
index 0000000..b6f79bf
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.genmodel
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen"
+    modelPluginID="org.eclipse.rcptt.ecl.client.tcp.tests" modelName="Commands" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    usedGenPackages="../../org.eclipse.rcptt.ecl.core/model/ecl.genmodel#//core platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>commands.ecore</foreignModel>
+  <genPackages prefix="Tests" basePackage="org.eclipse.rcptt.ecl.client.tcp" disposableProviderFactory="true"
+      literalsInterface="false" ecorePackage="commands.ecore#/">
+    <genClasses ecoreClass="commands.ecore#//EclInjectedCommand"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.properties b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.properties
new file mode 100644
index 0000000..cd61e7a
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = ECL TCP Client Tests
+providerName = Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.xml b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.xml
new file mode 100644
index 0000000..f50ba57
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.rcptt.ecl.core.scriptlet">
+      <scriptlet
+            class="org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommandService"
+            name="EclInjectedCommand"
+            namespace="http://www.eclipse.org/ecl/testcommands.ecore">
+      </scriptlet>
+   </extension>
+null
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated commands -->
+      <package
+            uri="http://www.eclipse.org/ecl/testcommands.ecore"
+            class="org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage"
+            genModel="model/commands.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml
index abfbef3..b4d19c4 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2009, 2019 Xored Software Inc and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-     
-    Contributors:
-    	Xored Software Inc - initial API and implementation and/or initial documentation
- -->
+<!-- Copyright (c) 2009, 2019 Xored Software Inc and others. All rights reserved. 
+	This program and the accompanying materials are made available under the 
+	terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+	and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: 
+	Xored Software Inc - initial API and implementation and/or initial documentation -->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -16,7 +11,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.client.tcp.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommand.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommand.java
new file mode 100644
index 0000000..03b6342
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommand.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Ecl Injected Command</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage#getEclInjectedCommand()
+ * @model
+ * @generated
+ */
+public interface EclInjectedCommand extends Command {
+} // EclInjectedCommand
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsFactory.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsFactory.java
new file mode 100644
index 0000000..8deb788
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsFactory.java
@@ -0,0 +1,42 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage
+ * @generated
+ */
+public interface TestsFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	TestsFactory eINSTANCE = org.eclipse.rcptt.ecl.client.tcp.tests.impl.TestsFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Ecl Injected Command</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Ecl Injected Command</em>'.
+	 * @generated
+	 */
+	EclInjectedCommand createEclInjectedCommand();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	TestsPackage getTestsPackage();
+
+} //TestsFactory
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsPackage.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsPackage.java
new file mode 100644
index 0000000..46b3a95
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsPackage.java
@@ -0,0 +1,116 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.rcptt.ecl.core.CorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface TestsPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "tests";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/ecl/testcommands.ecore";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "org.eclipse.rcptt.ecl.client.tcp.tests";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	TestsPackage eINSTANCE = org.eclipse.rcptt.ecl.client.tcp.tests.impl.TestsPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.rcptt.ecl.client.tcp.tests.impl.EclInjectedCommandImpl <em>Ecl Injected Command</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.impl.EclInjectedCommandImpl
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.impl.TestsPackageImpl#getEclInjectedCommand()
+	 * @generated
+	 */
+	int ECL_INJECTED_COMMAND = 0;
+
+	/**
+	 * The feature id for the '<em><b>Host</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_INJECTED_COMMAND__HOST = CorePackage.COMMAND__HOST;
+
+	/**
+	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_INJECTED_COMMAND__BINDINGS = CorePackage.COMMAND__BINDINGS;
+
+	/**
+	 * The number of structural features of the '<em>Ecl Injected Command</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_INJECTED_COMMAND_FEATURE_COUNT = CorePackage.COMMAND_FEATURE_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand <em>Ecl Injected Command</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Ecl Injected Command</em>'.
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand
+	 * @generated
+	 */
+	EClass getEclInjectedCommand();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	TestsFactory getTestsFactory();
+
+} //TestsPackage
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/EclInjectedCommandImpl.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/EclInjectedCommandImpl.java
new file mode 100644
index 0000000..1df4c30
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/EclInjectedCommandImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand;
+import org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage;
+
+import org.eclipse.rcptt.ecl.core.impl.CommandImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Ecl Injected Command</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EclInjectedCommandImpl extends CommandImpl implements EclInjectedCommand {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EclInjectedCommandImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestsPackage.eINSTANCE.getEclInjectedCommand();
+	}
+
+} //EclInjectedCommandImpl
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsFactoryImpl.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsFactoryImpl.java
new file mode 100644
index 0000000..06b314d
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsFactoryImpl.java
@@ -0,0 +1,97 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TestsFactoryImpl extends EFactoryImpl implements TestsFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TestsFactory init() {
+		try {
+			TestsFactory theTestsFactory = (TestsFactory)EPackage.Registry.INSTANCE.getEFactory(TestsPackage.eNS_URI);
+			if (theTestsFactory != null) {
+				return theTestsFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new TestsFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TestsFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case TestsPackage.ECL_INJECTED_COMMAND: return createEclInjectedCommand();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EclInjectedCommand createEclInjectedCommand() {
+		EclInjectedCommandImpl eclInjectedCommand = new EclInjectedCommandImpl();
+		return eclInjectedCommand;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TestsPackage getTestsPackage() {
+		return (TestsPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static TestsPackage getPackage() {
+		return TestsPackage.eINSTANCE;
+	}
+
+} //TestsFactoryImpl
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsPackageImpl.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsPackageImpl.java
new file mode 100644
index 0000000..6d53763
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsPackageImpl.java
@@ -0,0 +1,178 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand;
+import org.eclipse.rcptt.ecl.client.tcp.tests.TestsFactory;
+import org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage;
+
+import org.eclipse.rcptt.ecl.core.CorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TestsPackageImpl extends EPackageImpl implements TestsPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eclInjectedCommandEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private TestsPackageImpl() {
+		super(eNS_URI, TestsFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link TestsPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static TestsPackage init() {
+		if (isInited) return (TestsPackage)EPackage.Registry.INSTANCE.getEPackage(TestsPackage.eNS_URI);
+
+		// Obtain or create and register package
+		Object registeredTestsPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		TestsPackageImpl theTestsPackage = registeredTestsPackage instanceof TestsPackageImpl ? (TestsPackageImpl)registeredTestsPackage : new TestsPackageImpl();
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		CorePackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theTestsPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theTestsPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theTestsPackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(TestsPackage.eNS_URI, theTestsPackage);
+		return theTestsPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEclInjectedCommand() {
+		return eclInjectedCommandEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TestsFactory getTestsFactory() {
+		return (TestsFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		eclInjectedCommandEClass = createEClass(ECL_INJECTED_COMMAND);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		eclInjectedCommandEClass.getESuperTypes().add(theCorePackage.getCommand());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(eclInjectedCommandEClass, EclInjectedCommand.class, "EclInjectedCommand", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //TestsPackageImpl
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsAdapterFactory.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsAdapterFactory.java
new file mode 100644
index 0000000..567e021
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsAdapterFactory.java
@@ -0,0 +1,140 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.*;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage
+ * @generated
+ */
+public class TestsAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static TestsPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TestsAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = TestsPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TestsSwitch<Adapter> modelSwitch =
+		new TestsSwitch<Adapter>() {
+			@Override
+			public Adapter caseEclInjectedCommand(EclInjectedCommand object) {
+				return createEclInjectedCommandAdapter();
+			}
+			@Override
+			public Adapter caseCommand(Command object) {
+				return createCommandAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand <em>Ecl Injected Command</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand
+	 * @generated
+	 */
+	public Adapter createEclInjectedCommandAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.ecl.core.Command <em>Command</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.rcptt.ecl.core.Command
+	 * @generated
+	 */
+	public Adapter createCommandAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //TestsAdapterFactory
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsSwitch.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsSwitch.java
new file mode 100644
index 0000000..087249c
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsSwitch.java
@@ -0,0 +1,128 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.*;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage
+ * @generated
+ */
+public class TestsSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static TestsPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TestsSwitch() {
+		if (modelPackage == null) {
+			modelPackage = TestsPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case TestsPackage.ECL_INJECTED_COMMAND: {
+				EclInjectedCommand eclInjectedCommand = (EclInjectedCommand)theEObject;
+				T result = caseEclInjectedCommand(eclInjectedCommand);
+				if (result == null) result = caseCommand(eclInjectedCommand);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Ecl Injected Command</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ecl Injected Command</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEclInjectedCommand(EclInjectedCommand object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Command</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Command</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCommand(Command object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //TestsSwitch
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommandService.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommandService.java
new file mode 100644
index 0000000..80cf8ac
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommandService.java
@@ -0,0 +1,29 @@
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rcptt.ecl.core.Command;
+import org.eclipse.rcptt.ecl.runtime.ICommandService;
+import org.eclipse.rcptt.ecl.runtime.IProcess;
+
+import com.google.common.base.Function;
+
+public class EclInjectedCommandService implements ICommandService {
+	public static Function<Command, IStatus> delegate = new Function<Command, IStatus>() {
+		@Override
+		public IStatus apply(Command ignored) {
+			return Status.OK_STATUS;
+		}
+	};
+
+	public EclInjectedCommandService() {
+	}
+
+	@Override
+	public IStatus service(Command command, IProcess context) throws InterruptedException, CoreException {
+		return delegate.apply(command);
+	}
+
+}
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java
index 6637522..ea1054b 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java
@@ -10,42 +10,145 @@
  *******************************************************************************/
 package org.eclipse.rcptt.ecl.internal.client.tcp.tests;
 
+import com.google.common.base.Function;
+import com.google.common.io.Closer;
+
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetAddress;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.rcptt.ecl.client.tcp.EclTcpClientManager;
-import org.eclipse.rcptt.ecl.core.tests.AbstractCoreTest;
+import org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommandService;
+import org.eclipse.rcptt.ecl.core.Command;
 import org.eclipse.rcptt.ecl.platform.commands.CommandsFactory;
 import org.eclipse.rcptt.ecl.platform.commands.ListPlugins;
 import org.eclipse.rcptt.ecl.runtime.IPipe;
 import org.eclipse.rcptt.ecl.runtime.IProcess;
 import org.eclipse.rcptt.ecl.runtime.ISession;
 import org.eclipse.rcptt.ecl.server.tcp.EclTcpServerManager;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import junit.framework.TestCase;
 
-public class TestTcpSession extends AbstractCoreTest {
+public class TestTcpSession {
+
+	private static final int PORT = EclTcpClientManager.DEFAULT_PORT + 1;
 
 	private static final String LOCALHOST = "127.0.0.1";
 
-	// @Override
-	protected ISession createSession() throws Exception {
-		return EclTcpClientManager.Instance.startClientSession(
-				// InetAddress.getLocalHost(),
-				InetAddress.getByName(LOCALHOST),
-				EclTcpClientManager.DEFAULT_PORT + 1);
+	private final Closer closer = Closer.create();
+
+	private ISession session;
+
+	@Before
+	public void before() throws IOException {
+		EclTcpServerManager.Instance.startServer(PORT);
+		closer.register(new Closeable() {
+			@Override
+			public void close() throws IOException {
+				EclTcpServerManager.Instance.stopServer(PORT);
+			}
+		});
+		session = EclTcpClientManager.Instance.startClientSession(InetAddress.getByName(LOCALHOST), PORT);
+		closer.register(new Closeable() {
+			@Override
+			public void close() throws IOException {
+				try {
+					session.close();
+				} catch (CoreException e) {
+					throw new IOException(e);
+				}
+			}
+		});
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				return Status.OK_STATUS;
+			}
+		};
 	}
 
-	static {
-		try {
-			EclTcpServerManager.Instance
-					.startServer(EclTcpClientManager.DEFAULT_PORT + 1);
-		} catch (IOException e) {
-			e.printStackTrace();
+	@After
+	public void closeServer() throws CoreException, IOException {
+		closer.close();
+	}
+
+	@Test
+	public void simpleExecution() throws CoreException, InterruptedException {
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				return new Status(IStatus.INFO, "id", "message");
+			}
+		};
+		IStatus status = executeCommand();
+		Assert.assertFalse(status.getMessage(), status.matches(IStatus.ERROR | IStatus.WARNING | IStatus.CANCEL));
+		Assert.assertTrue(status.matches(IStatus.INFO));
+		Assert.assertEquals("message", status.getMessage());
+	}
+
+	private IStatus executeCommand() throws CoreException, InterruptedException {
+		IProcess process = session
+				.execute(org.eclipse.rcptt.ecl.client.tcp.tests.TestsFactory.eINSTANCE.createEclInjectedCommand());
+		IStatus status = process.waitFor();
+		return status;
+	}
+
+	@Test
+	public void errorIsReported() throws CoreException, InterruptedException {
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				return new Status(IStatus.ERROR, "id", "message");
+			}
+		};
+		IStatus status = executeCommand();
+		Assert.assertTrue(status.matches(IStatus.ERROR));
+		Assert.assertEquals("message", status.getMessage());
+	}
+
+	private static void absurdFunctionThatThrows() {
+		IStatus status = new Status(IStatus.ERROR, "id", "message2", new IllegalStateException("message3"));
+		CoreException coreException = new CoreException(status);
+		throw new RuntimeException(coreException);
+	}
+
+	@Test
+	public void istatusPropagatesTraces() throws CoreException, InterruptedException {
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				absurdFunctionThatThrows();
+				return Status.OK_STATUS;
+			}
+		};
+		IStatus status = executeCommand();
+		Throwable e = status.getException();
+		while (! (e instanceof CoreException)) {
+			if (e == null)
+				Assert.fail("CoreException is not found");
+			e = e.getCause();
 		}
+		CoreException coreException = (CoreException) e;
+		IllegalStateException illegalStateException = (IllegalStateException) coreException.getCause();
+		Assert.assertEquals("message3", illegalStateException.getMessage());
+		boolean found = false;
+		for (StackTraceElement element: illegalStateException.getStackTrace()) {
+			if (element.getMethodName().endsWith("absurdFunctionThatThrows")) {
+				found = true;
+				break; 
+			}
+		}
+		Assert.assertTrue(found);
 	}
 
+	@Test
 	public void testCommandExecution001() throws Throwable {
 		ListPlugins listPlugins = CommandsFactory.eINSTANCE.createListPlugins();
 		IProcess process = session.execute(listPlugins);
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/test.xml b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/test.xml
deleted file mode 100644
index 682c6ac..0000000
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/test.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Copyright (c) 2009, 2016 Xored Software Inc and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-     
-    Contributors:
-    	Xored Software Inc - initial API and implementation and/or initial documentation
- -->
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<property name="eclipse-home" value="${basedir}\..\.." />
-
-	<!-- sets the properties eclipse-home, and library-file -->
-	<property name="plugin-name" value="org.eclipse.rcptt.ecl.client.tcp.tests" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.2.0/library.xml" />
-
-	<property name="workspace" value="${basedir}/${plugin-name}/workspace" />
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp />
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org*.xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<delete dir="${workspace}" quiet="true" />
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${workspace}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="org.eclipse.rcptt.ecl.internal.client.tcp.tests.AllTests" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<delete dir="${workspace}" quiet="true" />
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org*.xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-	</target>
-
-</project>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF
index ae4e06c..4edb510 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.core.tests;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -13,8 +13,8 @@
  org.eclipse.rcptt.ecl.core.tests.model.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.junit,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.ecl.interop;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml
index aac57a1..a1ed531 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF
index bf20001..d9a251a 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.eclipse.rcptt.ecl.data
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
- org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
  com.google.guava
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml
index 933cc6b..241e614 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF
index 4462f8a..ffd2486 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Localization: plugin
 Bundle-Name: ECL Documentation Tests
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.doc.tests;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.doc.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
- org.eclipse.rcptt.ecl.doc;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.doc;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml
index 6a3e514..3d5e81e 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.doc.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF
index 572f3ff..7e88f65 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.operations.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.common,
- org.eclipse.rcptt.ecl.operations;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.operations;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %pluginProvider
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml
index 854e097..5160bc3 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.operations.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF
index 73c9d61..cb76bb2 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Parser Tests
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.parser.test;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.antlr.runtime;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.rcptt.ecl.operations;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.operations;bundle-version="[2.5.0,3.0.0)",
  com.google.guava
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.parser.test
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml
index aeb66c0..de30c9d 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.parser.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF
index c4ccb7a..f21dc1f 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for org.eclipse.rcptt.ecl.perf plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.perf.tests
-Bundle-Version: 2.4.4.qualifier
-Fragment-Host: org.eclipse.rcptt.ecl.perf;bundle-version="[2.4.4,3.0.0)"
+Bundle-Version: 2.5.0.qualifier
+Fragment-Host: org.eclipse.rcptt.ecl.perf;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.0.0"
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml
index 0923b54..5bb36bd 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.perf.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/pom.xml b/ecl/tests/pom.xml
index f806f6a..7d75027 100644
--- a/ecl/tests/pom.xml
+++ b/ecl/tests/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/launching/org.eclipse.rcptt.launching-feature/feature.xml b/launching/org.eclipse.rcptt.launching-feature/feature.xml
index 6a0b1f6..81817d2 100644
--- a/launching/org.eclipse.rcptt.launching-feature/feature.xml
+++ b/launching/org.eclipse.rcptt.launching-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rcptt.launching"
       label="RCPTT launching components"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,86 +29,86 @@
 
    <requires>
       <import plugin="com.google.guava"/>
-      <import feature="org.eclipse.rcptt.ecl.platform" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.updates" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.platform" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.updates" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.common"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.ext"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.remote"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.injection"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting.util"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.p2utils"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.multiaut"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting.html"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/launching/org.eclipse.rcptt.launching-feature/pom.xml b/launching/org.eclipse.rcptt.launching-feature/pom.xml
index c11c7e2..0e0fa59 100644
--- a/launching/org.eclipse.rcptt.launching-feature/pom.xml
+++ b/launching/org.eclipse.rcptt.launching-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.launching</artifactId>
diff --git a/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF
index e549eac..b960deb 100644
--- a/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Launching Stuff
 Bundle-SymbolicName: org.eclipse.rcptt.launching.common
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.common.CommonLaunchingPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/launching/org.eclipse.rcptt.launching.common/pom.xml b/launching/org.eclipse.rcptt.launching.common/pom.xml
index d26c57e..b46d887 100644
--- a/launching/org.eclipse.rcptt.launching.common/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.common/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.common</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF
index 9fe053e..5fe8e92 100644
--- a/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.ext;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.ext.Q7ExtLaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core;bundle-version="3.9.0",
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.metadata,
@@ -20,20 +20,20 @@
  org.eclipse.pde.build,
  org.eclipse.jdt.launching,
  org.eclipse.pde.launching,
- org.eclipse.rcptt.launching.injection;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.injection;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.core,
  org.eclipse.equinox.simpleconfigurator,
  com.google.guava;bundle-version="21.0.0",
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.p2.artifact.repository,
  org.eclipse.equinox.p2.touchpoint.eclipse,
  org.eclipse.equinox.p2.engine,
- org.eclipse.rcptt.launching.p2utils;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.p2utils;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables,
  org.eclipse.core.commands,
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
  org.apache.felix.scr,
  org.eclipse.equinox.launcher,
  org.eclipse.core.filesystem
diff --git a/launching/org.eclipse.rcptt.launching.ext/pom.xml b/launching/org.eclipse.rcptt.launching.ext/pom.xml
index 6b07e3a..7f8e90e 100644
--- a/launching/org.eclipse.rcptt.launching.ext/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.ext/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.ext</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java
index a21e267..ed6cf50 100644
--- a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java
+++ b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java
@@ -178,44 +178,10 @@
 		if (major != 3)
 			return;
 		int minor = ((OSGiVersion) swtVersion).getMinor();
-		if (minor == 0) {
-			values.put(VERSION, "3.0");
-		} else if (minor == 1) {
-			values.put(VERSION, "3.1");
-		} else if (minor == 2) {
-			values.put(VERSION, "3.2");
-		} else if (minor == 3) {
-			values.put(VERSION, "3.3");
-		} else if (minor == 4) {
-			values.put(VERSION, "3.4");
-		} else if (minor == 5) {
-			values.put(VERSION, "3.5");
-		} else if (minor == 6) {
-			values.put(VERSION, "3.6");
-		} else if (minor == 7) {
-			values.put(VERSION, "3.7");
-		} else if (minor == 8) {
-			values.put(VERSION, "3.8");
+		if (minor < 100) {
+			values.put(VERSION, "3." + minor);
 		} else if (minor == 100) {
 			values.put(VERSION, "4.2");
-		} else if (minor == 102) {
-			values.put(VERSION, "4.3");
-		} else if (minor == 103) {
-			values.put(VERSION, "4.4");
-		} else if (minor == 104) {
-			values.put(VERSION, "4.5");
-		} else if (minor == 105) {
-			values.put(VERSION, "4.6");
-		} else if (minor == 106) {
-			values.put(VERSION, "4.7");
-		} else if (minor == 107) {
-			values.put(VERSION, "4.8");
-		} else if (minor == 108) {
-			values.put(VERSION, "4.9");
-		} else if (minor == 109) {
-			values.put(VERSION, "4.10");
-		} else if (minor == 110) {
-			values.put(VERSION, "4.11");
 		} else if (minor < 200) {
 			values.put(VERSION, "4." + (minor - 99));
 		}
@@ -228,7 +194,7 @@
 		if (major != 3)
 			return;
 		int minor = ((OSGiVersion) swtVersion).getMinor();
-		if (minor <= 8) {
+		if (minor < 100) {
 			values.put(VERSION, "4.3");
 		}
 	}
diff --git a/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF
index 9eac34a..548ed84 100644
--- a/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.injection;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/launching/org.eclipse.rcptt.launching.injection/pom.xml b/launching/org.eclipse.rcptt.launching.injection/pom.xml
index bc9bd09..0d50863 100644
--- a/launching/org.eclipse.rcptt.launching.injection/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.injection/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.injection</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF
index b3fe38e..6687dab 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.multiaut.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.multiaut.ui.MultiAutUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.ui,
  org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.multiaut;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.multiaut;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml b/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml
index 87e023d..e5eef09 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.multiaut.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF
index 33bf4ed..c31f64e 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.multiaut;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.multiaut.MultiAutLaunchPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  com.google.gson,
  org.eclipse.debug.core,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.core;bundle-version="2.4.4"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.launching.multiaut
diff --git a/launching/org.eclipse.rcptt.launching.multiaut/pom.xml b/launching/org.eclipse.rcptt.launching.multiaut/pom.xml
index cefff86..1d310ab 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.multiaut/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.multiaut</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
index 43d1266..c08a821 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.p2utils
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.p2utils.Q7P2UtilsActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,11 +14,11 @@
  org.eclipse.equinox.p2.metadata.repository,
  org.eclipse.equinox.p2.repository,
  org.eclipse.equinox.p2.touchpoint.eclipse,
- org.eclipse.rcptt.launching.injection;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.injection;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core,
  org.eclipse.equinox.p2.repository.tools,
  org.eclipse.equinox.p2.director,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.launching.p2utils
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/pom.xml b/launching/org.eclipse.rcptt.launching.p2utils/pom.xml
index 62316cc..65e661c 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.p2utils/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.cloud</groupId>
   <artifactId>org.eclipse.rcptt.launching.p2utils</artifactId>
diff --git a/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF
index faf7bd5..d99920c 100644
--- a/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.remote;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.remote.Q7RemoteLaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)";resolution:=optional,
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)";resolution:=optional,
  org.eclipse.equinox.p2.metadata,
  org.eclipse.equinox.p2.repository,
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.launching.remote
diff --git a/launching/org.eclipse.rcptt.launching.remote/pom.xml b/launching/org.eclipse.rcptt.launching.remote/pom.xml
index 2315440..47a296c 100644
--- a/launching/org.eclipse.rcptt.launching.remote/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.remote/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.launching.remote</artifactId>
diff --git a/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
index 59d6b85..6787241 100644
--- a/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.Q7LaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core,
  org.eclipse.pde.launching,
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.launching,
diff --git a/launching/org.eclipse.rcptt.launching/pom.xml b/launching/org.eclipse.rcptt.launching/pom.xml
index 7ff50a5..6447282 100644
--- a/launching/org.eclipse.rcptt.launching/pom.xml
+++ b/launching/org.eclipse.rcptt.launching/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF
index aa18639..03cab85 100644
--- a/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.reporting.html;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  com.google.guava,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-ClassPath: .
 Export-Package: org.eclipse.rcptt.reporting.html
diff --git a/launching/org.eclipse.rcptt.reporting.html/pom.xml b/launching/org.eclipse.rcptt.reporting.html/pom.xml
index d17fd93..6e32e56 100644
--- a/launching/org.eclipse.rcptt.reporting.html/pom.xml
+++ b/launching/org.eclipse.rcptt.reporting.html/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
   	<groupId>org.eclipse.rcptt</groupId>
-  	<version>2.4.4-SNAPSHOT</version>
+  	<version>2.5.0-SNAPSHOT</version>
   	<artifactId>rcptt.launching</artifactId>
   </parent>
   <artifactId>org.eclipse.rcptt.reporting.html</artifactId>
diff --git a/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java b/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
index f4ad8e1..b92b4c0 100644
--- a/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
+++ b/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
@@ -27,15 +27,12 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.rcptt.ecl.core.CoreFactory;
 import org.eclipse.rcptt.ecl.core.EclException;
 import org.eclipse.rcptt.ecl.core.ProcessStatus;
 import org.eclipse.rcptt.reporting.Q7Info;
 import org.eclipse.rcptt.reporting.core.ReportHelper;
 import org.eclipse.rcptt.reporting.core.SimpleSeverity;
 import org.eclipse.rcptt.reporting.util.ReportUtils;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.LoggingCategory;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
@@ -223,8 +220,8 @@
 	}
 
 	private void renderEvent(EObject eObject) {
-		if (eObject instanceof EclipseStatus) {
-			renderResult(toResult((EclipseStatus) eObject));
+		if (eObject instanceof ProcessStatus) {
+			renderResult((ProcessStatus) eObject);
 		} else if (eObject instanceof Screenshot) {
 			renderScreenShot((Screenshot) eObject, "");
 		} else if (eObject instanceof AdvancedInformation) {
@@ -321,28 +318,6 @@
 		return rv;
 	}
 
-	private ProcessStatus toResult(EclipseStatus input) {
-		ProcessStatus rv = CoreFactory.eINSTANCE.createProcessStatus();
-		rv.setSeverity(input.getSeverity());
-		rv.setMessage(input.getMessage());
-		rv.setException(toEclException(input.getException()));
-		rv.setPluginId(input.getPlugin());
-		for (EclipseStatus child : input.getChildren()) {
-			rv.getChildren().add(toResult(child));
-		}
-		return rv;
-	}
-
-	private EclException toEclException(JavaException input) {
-		if (input == null)
-			return null;
-		EclException rv = CoreFactory.eINSTANCE.createEclException();
-		rv.setCause(toEclException(input.getCause()));
-		rv.setClassName(input.getClassName());
-		rv.setMessage(input.getMessage());
-		return rv;
-	}
-	
 	private void openDetails(int level, String title, String classes) {
 		writer.print("<details class=\"closed\">");
 		writer.print("<summary>");
diff --git a/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF
index cf68f1c..3e00ce4 100644
--- a/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Utilities for RCPTT reporting
 Bundle-SymbolicName: org.eclipse.rcptt.reporting.util;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.rcptt.reporting.util,
  org.eclipse.rcptt.reporting.util.internal
diff --git a/launching/org.eclipse.rcptt.reporting.util/pom.xml b/launching/org.eclipse.rcptt.reporting.util/pom.xml
index 99e77dc..0a64b5c 100644
--- a/launching/org.eclipse.rcptt.reporting.util/pom.xml
+++ b/launching/org.eclipse.rcptt.reporting.util/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.cloud</groupId>
   <artifactId>org.eclipse.rcptt.reporting.util</artifactId>
diff --git a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java
index 17bb267..8b9639e 100644
--- a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java
+++ b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java
@@ -32,9 +32,6 @@
 import org.eclipse.rcptt.reporting.core.ReportHelper;
 import org.eclipse.rcptt.reporting.core.SimpleSeverity;
 import org.eclipse.rcptt.reporting.core.TimeFormatHelper;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.LoggingCategory;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
@@ -136,8 +133,8 @@
 	}
 
 	public void printObject(EObject object, int tabs) throws IOException {
-		if (object instanceof EclipseStatus) {
-			printStatus((EclipseStatus) object, tabs);
+		if (object instanceof ProcessStatus) {
+			printStatus((ProcessStatus) object, tabs);
 		} else if (object instanceof Snaphot) {
 			writeSnapshot((Snaphot) object, tabs);
 		} else {
@@ -169,43 +166,8 @@
 		new AdvancedInformationGenerator(writer).writeAdvanced(data, tabs);
 	}
 
-	private PrintWriter w(int tabs) {
-		return writeTabs(tabs);
-	}
-
-	private void printStatus(EclipseStatus status, int tabs) throws IOException {
-		SimpleSeverity severity = SimpleSeverity.create(status.getSeverity());
-		w(tabs).append(severity.name());
-		writer.append(" in plugin: ").println(status.getPlugin());
-		w(tabs).append("message: ").println(status.getMessage());
-		if (status.getException() != null) {
-			w(tabs).println("exception: ");
-			printJavaException(status.getException(), tabs + 2);
-		}
-		for (EclipseStatus child : status.getChildren()) {
-			printStatus(child, tabs + 1);
-		}
-	}
-
-	private void printJavaException(JavaException e, int tabs) {
-		w(tabs).append(e.getClassName());
-		if (!StringUtils.isEmpty(e.getMessage())) {
-			writer.print(":" + e.getMessage());
-		}
-		writer.println();
-		for (JavaStackTraceEntry st : e.getStackTrace()) {
-			w(tabs + 2).append("at ")
-					.append(st.getClassName()).append(".")
-					.append(st.getMethodName()).append("(")
-					.append(st.getFileName()).append(":")
-					.append("" + st.getLineNumber()).append(")")
-					.println();
-		}
-		JavaException cause = e.getCause();
-		if (cause != null) {
-			w(tabs + 2).println("Caused by:");
-			printJavaException(cause, tabs + 1);
-		}
+	private void printStatus(ProcessStatus status, int tabs) throws IOException {
+		writeResult(writer, tabs, status);
 	}
 
 	protected void printChildren(int tabs, Node infoNode) {
@@ -339,22 +301,27 @@
 					.append("time: " +
 							TimeFormatHelper.format(infoNode.getDuration()))
 					.println();
-			writeResult(tabs + 1, q7Info.getResult());
+			writeResult(writer, tabs + 1, q7Info.getResult());
 		}
 	}
 
-	public void writeResult(int tabs, ProcessStatus result) {
+	public static void writeResult(Writer writer, int tabs, ProcessStatus result) {
 		if (result == null)
 			result = RcpttPlugin.createProcessStatus(IStatus.ERROR, "Null result");
 		if (SimpleSeverity.create(result) == SimpleSeverity.OK)
 			return;
-		w(tabs).append("Result: ")
-				.append(SimpleSeverity.create(result).name())
-				.append(", message: ")
-				.println(ReportUtils.getDirectFailMessage(result, ReportUtils.DEFAULT_DATUM_TO_MESSAGE));
+		try {
+			writeTabs(writer, tabs).append("Result: ")
+					.append(SimpleSeverity.create(result).name())
+					.append(", message: ")
+					.append(ReportUtils.getDirectFailMessage(result, ReportUtils.DEFAULT_DATUM_TO_MESSAGE))
+					.append("\n");
+		} catch (IOException e) {
+			throw new IllegalArgumentException(e);
+		}
 		writeException(writer, tabs + 1, result.getException());
 		for (ProcessStatus child : result.getChildren()) {
-			writeResult(tabs + 1, child);
+			writeResult(writer, tabs + 1, child);
 		}
 	}
 
@@ -367,7 +334,13 @@
 				writeTabs(this, tabs);
 			}
 		};
-		ProcessStatusConverter.getThrowable(exception).printStackTrace(iwriter);
+		Throwable throwable = ProcessStatusConverter.getThrowable(exception);
+		throwable.printStackTrace(iwriter);
+		ProcessStatus status = exception.getStatus();
+		if (status != null) {
+			writeResult(iwriter, 1, status);
+		}
+			
 		iwriter.println();
 		iwriter.flush();
 	}
diff --git a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java
index 182efef..219db3d 100644
--- a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java
+++ b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java
@@ -64,8 +64,7 @@
 		Node root = next.getRoot();
 		Q7Info info = ReportHelper.getInfo(root);
 		StringWriter writer = new StringWriter();
-		new RcpttReportGenerator(new PrintWriter(writer), new ArrayList<ImageEntry>()).writeResult(0,
-				info.getResult());
+		RcpttReportGenerator.writeResult(new PrintWriter(writer), 0, info.getResult());
 		ReportEntry entry = new ReportEntry(root.getName(), info.getId(), (int) root.getDuration(),
 				info.getResult().getSeverity(), writer.toString());
 		return entry;
diff --git a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java
index 729801a..a1f3636 100644
--- a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java
+++ b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java
@@ -36,7 +36,6 @@
 import org.eclipse.rcptt.reporting.core.IQ7ReportConstants;
 import org.eclipse.rcptt.reporting.core.SimpleSeverity;
 import org.eclipse.rcptt.reporting.util.internal.Plugin;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.EventSource;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
@@ -438,8 +437,8 @@
 			}
 			EList<Event> events = item.getEvents();
 			for (Event event : events) {
-				if (event.getData() instanceof EclipseStatus) {
-					EclipseStatus data = (EclipseStatus) event.getData();
+				if (event.getData() instanceof ProcessStatus) {
+					ProcessStatus data = (ProcessStatus) event.getData();
 					new SimpleReportGenerator().toString(result, 1, data);
 					result.append("\n");
 				}
diff --git a/launching/pom.xml b/launching/pom.xml
index e50e076..f025988 100644
--- a/launching/pom.xml
+++ b/launching/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ide</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/ide/pom.xml</relativePath>    
   </parent>
 
diff --git a/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF b/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF
index ddb31bc..caf4112 100644
--- a/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF
+++ b/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.rcptt.launching.ext.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
-Fragment-Host: org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)"
diff --git a/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml b/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml
index 18f3515..f6c1f91 100644
--- a/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml
+++ b/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>launching.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.ext.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/.project b/launching/tests/org.eclipse.rcptt.launching.tests/.project
index ecc7d25..e60abec 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/.project
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1560931003758</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF b/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF
index 2037014..7d73be0 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Fragment-Host: org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-Name: Launching tests
 Bundle-SymbolicName: org.eclipse.rcptt.launching.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
- org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.registry,
  com.google.guava,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;bundle-version="3.11.0",
  org.mockito;bundle-version="1.9.5",
  org.hamcrest;bundle-version="1.1.0",
  org.eclipse.rcptt.ctx.script,
- org.eclipse.rcptt.ctx.workbench;bundle-version="2.4.4"
+ org.eclipse.rcptt.ctx.workbench;bundle-version="2.5.0"
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml b/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml
index f6dfcbd..95d9d1a 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>launching.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java b/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java
index a764e37..bcfe447 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java
@@ -180,9 +180,12 @@
 		});
 		try {
 			NullProgressMonitor monitor = new NullProgressMonitor();
-			Job.createSystem(m -> {
+			Job cancelJob = Job.createSystem("cancelJob", m -> {
 				monitor.setCanceled(true);
-			}).schedule(300);
+			});
+			cancelJob.setPriority(Job.INTERACTIVE);
+			cancelJob.schedule(300);
+			
 			subject.execute(script, Integer.MAX_VALUE, monitor);
 			Assert.fail("Should throw cancellation");
 		} catch (CoreException e) {
diff --git a/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF b/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF
index 67c0df9..b56356e 100644
--- a/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF
+++ b/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: HTML reporting tests
 Bundle-SymbolicName: org.eclipse.rcptt.reporting.html.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
- org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.registry,
  com.google.guava,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.html;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.html;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)"
diff --git a/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml b/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml
index 1a6c8a0..408b62d 100644
--- a/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml
+++ b/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>launching.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.reporting.html.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/launching/tests/pom.xml b/launching/tests/pom.xml
index 5070ccd..31d54c7 100644
--- a/launching/tests/pom.xml
+++ b/launching/tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>launching.tests</artifactId>
   <packaging>pom</packaging>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index cfeb96a..3d7e163 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -14,7 +14,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.rcptt</groupId>
 	<artifactId>rcptt-maven-modules</artifactId>
-	<version>2.4.4-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>RCPTT maven support modules</name>
 	<url>http://eclipse.org/rcptt</url>
diff --git a/maven-plugin/rcptt-maven-plugin/pom.xml b/maven-plugin/rcptt-maven-plugin/pom.xml
index 121b428..70b3dfa 100644
--- a/maven-plugin/rcptt-maven-plugin/pom.xml
+++ b/maven-plugin/rcptt-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<artifactId>rcptt-maven-modules</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/maven-plugin/rcptt-maven-util/pom.xml b/maven-plugin/rcptt-maven-util/pom.xml
index 601a199..b644d51 100644
--- a/maven-plugin/rcptt-maven-util/pom.xml
+++ b/maven-plugin/rcptt-maven-util/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<artifactId>rcptt-maven-modules</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
index 6518e7e..d559bd8 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.module.nebula.runtime"
       label="RCPTT Runtime plugins for Nebula module"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,35 +32,35 @@
          id="org.eclipse.rcptt.tesla.nebula"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.nebula"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml
index df76348..8d34fc5 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
index 89a413b..47115fe 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.module.nebula"
       label="RCPTT Nebula Widgets Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,27 +32,27 @@
          id="org.eclipse.rcptt.tesla.nebula"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.module.nebula.updates"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
 </feature>
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml
index 3545f26..21b6ee3 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF
index b397ba1..a2c5906 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Nebula Widgets Module
 Bundle-SymbolicName: org.eclipse.rcptt.module.nebula.updates;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml
index 43d8e5c..9800172 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.rcptt.module.nebula.updates</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt</groupId>
       <artifactId>org.eclipse.rcptt.module.nebula-runtime-site</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-update-site</type>
     </dependency>
   </dependencies>
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF
index ef88a3c..3775478 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation for Nebula
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.ecl.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.nebula.ecl.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml
index e8cb767..8a3f58c 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF
index b85e66a..82a8a73 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl.nebula,
  org.eclipse.rcptt.tesla.ecl.nebula.impl,
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml
index 7edfbe4..22ba836 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF
index 946fa4a..ceb75de 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Nebula Tesla Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.nebula.impl.NebulaImplPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.swt,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.nebula.widgets.grid,
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.core.protocol.nebula,
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml
index ac82b84..fe7b92b 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF
index fb622fd..a82a841 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.protocol.nebula
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml
index 875dc08..8cd3afc 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF
index 52376d0..ebb4b8b 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Nebula ECL Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.nebula.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)"
+Require-Bundle: org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)"
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml
index c4d7107..e81aa24 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF
index a4507e9..cc25b0f 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Nebula Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.nebula;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.nebula.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.nebula.widgets.grid,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.recording.nebula
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml
index 002a31f..cd716b2 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/pom.xml b/modules/nebula/pom.xml
index f948c18..eaa0d95 100644
--- a/modules/nebula/pom.xml
+++ b/modules/nebula/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>ide</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ide/pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/runtime-site/pom.xml b/modules/nebula/runtime-site/pom.xml
index a7deb51..3bb73bd 100644
--- a/modules/nebula/runtime-site/pom.xml
+++ b/modules/nebula/runtime-site/pom.xml
@@ -16,7 +16,7 @@
   <parent>
 	<artifactId>rcptt-module-nebula</artifactId>
 	<groupId>org.eclipse.rcptt</groupId>
-	<version>2.4.4-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/runtime-site/site.xml b/modules/nebula/runtime-site/site.xml
index 83dbfb1..aa48426 100644
--- a/modules/nebula/runtime-site/site.xml
+++ b/modules/nebula/runtime-site/site.xml
@@ -11,7 +11,7 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.module.nebula.runtime_2.4.4.qualifier.jar" id="org.eclipse.rcptt.module.nebula.runtime" version="2.4.4.qualifier">
+   <feature url="features/org.eclipse.rcptt.module.nebula.runtime_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.nebula.runtime" version="2.5.0.qualifier">
       <category name="rcptt"/>
    </feature>
    <category-def name="rcptt" label="RCP Testing Tool"/>
diff --git a/modules/nebula/site/pom.xml b/modules/nebula/site/pom.xml
index 2137320..c86537d 100644
--- a/modules/nebula/site/pom.xml
+++ b/modules/nebula/site/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>rcptt-module-nebula</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/nebula/site/site.xml b/modules/nebula/site/site.xml
index 953e7f2..c0b14fa 100644
--- a/modules/nebula/site/site.xml
+++ b/modules/nebula/site/site.xml
@@ -11,7 +11,7 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.module.nebula_2.4.4.qualifier.jar" id="org.eclipse.rcptt.module.nebula" version="2.4.4.qualifier">
+   <feature url="features/org.eclipse.rcptt.module.nebula_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.nebula" version="2.5.0.qualifier">
       <category name="rcptt"/>
    </feature>
    <category-def name="rcptt" label="RCP Testing Tool"/>
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF
index bfa946a..b94eec4 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl.rap.model,
  org.eclipse.rcptt.tesla.ecl.rap.model.impl,
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml
index 71040bc..0dd5c7b 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF
index 0b17882..703ddd5 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Core ECL Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.core.ecl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)"
+Require-Bundle: org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)"
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml
index 80705c4..4909af1 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/core/pom.xml b/modules/rap/bundles/core/pom.xml
index ade07f1..4f49a92 100644
--- a/modules/rap/bundles/core/pom.xml
+++ b/modules/rap/bundles/core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF
index 01644dd..3fc3988 100644
--- a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.platform.ui.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@
  org.eclipse.rcptt.ecl.platform.ui.commands.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.platform.ui.rap;visibility:=reexport,
  org.eclipse.rap.ui,
  org.eclipse.rcptt.util
diff --git a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml
index b0002f6..ba252eb 100644
--- a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml
+++ b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.ecl.platform.ui.rap</artifactId>
diff --git a/modules/rap/bundles/ecl/pom.xml b/modules/rap/bundles/ecl/pom.xml
index 41a8cf0..2d1ca74 100644
--- a/modules/rap/bundles/ecl/pom.xml
+++ b/modules/rap/bundles/ecl/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF
index d0be5a0..da3666d 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT RAP AUT Launching UI
 Bundle-SymbolicName: org.eclipse.rcptt.launching.rap.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.rap.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.debug.ui,
  org.eclipse.pde.ui,
  org.eclipse.jdt.launching,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.p2.repository,
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.engine,
@@ -26,7 +26,7 @@
  org.eclipse.equinox.p2.operations,
  org.eclipse.jface.text,
  org.eclipse.core.variables,
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml
index 82d956e..e4fe2bf 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>launching</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.rap.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF
index 71652b5..45cc644 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml
index 9b75d99..1991a59 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>launching</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.launching.rap</artifactId>
diff --git a/modules/rap/bundles/launching/pom.xml b/modules/rap/bundles/launching/pom.xml
index 74cbc39..29bad31 100644
--- a/modules/rap/bundles/launching/pom.xml
+++ b/modules/rap/bundles/launching/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>bundles</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/pom.xml b/modules/rap/bundles/pom.xml
index 8e37a7c..d4037ca 100644
--- a/modules/rap/bundles/pom.xml
+++ b/modules/rap/bundles/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>rcptt.module.rap</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF
index 07e5d25..5c928c9 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Debug Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.debug.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.debug.runtime.rap.Q7DebugRuntime
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.debug;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.debug;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
  org.eclipse.core.variables
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml
index 674c6aa..cc66a68 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.debug.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF
index ea9893c..6744fc6 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: File System Context Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.filesystem.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.filesystem.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.util
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml
index 2b92fae..ecaa51d 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.filesystem.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF
index 9303d08..6a0800f 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Parameters Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.parameters.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.parameters.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.parameters.impl.rap
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml
index 3a4fc96..8a202fc 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.parameters.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF
index c2333e9..6b6d293 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml
index 80d6070..39ab808 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF
index 0883792..b2047fa 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Preferences Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.preferences.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.preferences;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.preferences;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.security;resolution:=optional;x-installation:=greedy,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.rcptt.runtime.ui.preferences,
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml
index f2fd38e..b6f7d88 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF
index 172e1ee..6821df5 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.resources.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.impl.internal.resources.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources,
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.resources;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.resources;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.filebuffers;resolution:=optional,
  org.eclipse.core.filesystem;resolution:=optional,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml
index 6ab44ea..c4c3e45 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.resources.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF
index 39ce697..f5f19db 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT ECL Scenario Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.script.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.script.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml
index b4e1333..dcd8f8f 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.script.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF
index 471d22a..8c9dd23 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.aspect.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.aspect.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml
index 396f2b4..8c10ec6 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.aspect.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF
index 5e0fc01..2782962 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.workbench;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.workbench;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui,
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml
index 60a1a20..a22d005 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/pom.xml b/modules/rap/bundles/runtime/contexts/pom.xml
index 5333d53..23abd3a 100644
--- a/modules/rap/bundles/runtime/contexts/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>rcptt.runtime.contexts</artifactId>
diff --git a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF
index 65bd82e..8007a61 100644
--- a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
  org.eclipse.rap.jface,
  org.eclipse.rap.ui,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables
 Bundle-Activator: org.eclipse.rcptt.tesla.ecl.internal.impl.TeslaImplPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml
index 9512975..7687939 100644
--- a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ecl-tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ecl.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/ecl/pom.xml b/modules/rap/bundles/runtime/ecl/pom.xml
index 81afffe..be32df0 100644
--- a/modules/rap/bundles/runtime/ecl/pom.xml
+++ b/modules/rap/bundles/runtime/ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF
index 82a1221..9afed45 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.debug.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.debug.rap.Q7EclDebugPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml
index 3918082..8d29e23 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.debug.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF
index 0631cc8..07ae993 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Record/Replay support for forms
 Bundle-SymbolicName: org.eclipse.rcptt.forms.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Xored Software Inc.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui.forms,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.forms.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0]"
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.forms.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0]"
 
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml
index aa62fa7..2adea48 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.forms.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF
index 324998a..0b2a56d 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT RAP Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.rap.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.rap.rwt,
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml
index 03516f5..9ce67a6 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.rap.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF
index 727baa9..9188419 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI
 Bundle-SymbolicName: org.eclipse.rcptt.runtime.ui.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.runtime.ui.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;resolution:=optional,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ui.ide.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ui.ide.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.runtime.ui.rap,
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml
index e704cb1..61889b4 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.runtime.ui.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF
index 7b31946..6b4b6b5 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT RCPTT Utiilties
 Bundle-SymbolicName: org.eclipse.rcptt.util.swt.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.util.swt.internal.SwtUtilPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml
index f65df20..f618491 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util.swt.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/pom.xml b/modules/rap/bundles/runtime/pom.xml
index 45555f9..52f6fb5 100644
--- a/modules/rap/bundles/runtime/pom.xml
+++ b/modules/rap/bundles/runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>bundles</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF
index d987f1c..2448858 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Canvas Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.canvas.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.canvas.rap.CanvasActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.canvas.rap
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml
index 31a3f9c..2a973bf 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.canvas.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF
index a48e09b..f3c4a0d 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Aspect Manager Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core.am.rap
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.core.am.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml
index 9fe51ac..f222209 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rc