diff --git a/build.gradle b/build.gradle
index ab8a48f..0deaf5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,7 @@
 plugins {
-	id 'org.xtext.xtend' version '2.0.7'
+	id 'org.xtext.xtend' version '2.0.7' apply false
+	id 'com.github.dkorotych.gradle-maven-exec' version '2.2.1'
+	id 'org.hidetake.ssh' version '2.10.1'
 }
 
 apply from: "$rootDir/gradle/scmVersion.gradle"
@@ -34,5 +36,4 @@
 			url 'https://repo.eclipse.org/content/repositories/maven_central/'
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
index 25c644b..45ad453 100644
--- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Generator Launcher
 Bundle-SymbolicName: my.etrice.generator.launch;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: my.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
- org.eclipse.etrice.generator.launch.java;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.java;bundle-version="2.0.0",
- org.eclipse.debug.ui;bundle-version="3.8.1",
- org.eclipse.swt;bundle-version="3.100.1",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.jdt.launching;bundle-version="3.6.100",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+Require-Bundle: my.etrice.generator,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.launch,
+  org.eclipse.etrice.generator.launch.java,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator.java,
+ org.eclipse.debug.ui,
+ org.eclipse.swt,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.launching,
+  org.eclipse.etrice.generator.base
 Automatic-Module-Name: my.etrice.generator.launch
diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF
index 45de050..36e5136 100644
--- a/examples/my.etrice.generator/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Generator
 Bundle-SymbolicName: my.etrice.generator
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.java;bundle-version="2.0.0",
- com.google.inject;bundle-version="3.0.0"
+Require-Bundle: org.eclipse.etrice.core.fsm,
+ org.eclipse.etrice.core.room,
+ org.eclipse.etrice.generator.fsm,
+ org.eclipse.etrice.generator,
+ org.eclipse.etrice.generator.java,
+ com.google.inject
 Export-Package: my.etrice.generator
 Automatic-Module-Name: my.etrice.generator
diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
index 48a18b6..d572c77 100644
--- a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
+++ b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.cdt_integration.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="0.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.etrice.core.room.ui"
       license-feature="org.eclipse.license"
@@ -40,16 +40,7 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.etrice.generator.ui" version="0.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="8.2.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.common" version="3.6.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ant.launching"/>
       <import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.ant.ui"/>
-      <import plugin="org.eclipse.core.externaltools"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 8f1f90a..1d1a504 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="0.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.etrice.core.room.ui"
       license-feature="org.eclipse.license"
@@ -44,9 +44,8 @@
    </url>
 
    <requires>
-      <import plugin="org.apache.commons.io" version="2.0.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.xtext.redist" version="2.12.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.xtext.runtime" version="2.15.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.etrice.fsm.feature/feature.xml b/features/org.eclipse.etrice.fsm.feature/feature.xml
index 24c738e..b21dabf 100644
--- a/features/org.eclipse.etrice.fsm.feature/feature.xml
+++ b/features/org.eclipse.etrice.fsm.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.fsm.feature"
       label="eTrice.FSM Feature"
-      version="2.0.0.qualifier"
+      version="0.0.0.qualifier"
       provider-name="eTrice"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index acbd645..f9734e2 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.etrice.tests.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="0.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -22,40 +22,40 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.etrice.core.room" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.common" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.fsm" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.room"/>
+      <import plugin="org.eclipse.etrice.core.common"/>
+      <import plugin="org.eclipse.etrice.core.fsm"/>
       <import plugin="org.junit" version="4.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.junit4" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.etrice.generator" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.fsm" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common.base" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator"/>
+      <import plugin="org.eclipse.etrice.generator.fsm"/>
+      <import plugin="org.eclipse.etrice.ui.behavior"/>
+      <import plugin="org.eclipse.etrice.ui.behavior.fsm"/>
+      <import plugin="org.eclipse.etrice.ui.common"/>
+      <import plugin="org.eclipse.etrice.ui.common.base"/>
       <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.structure" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.etunit.converter" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.structure"/>
+      <import plugin="org.eclipse.etrice.etunit.converter"/>
       <import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.genmodel" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.genmodel"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config.ui" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config"/>
+      <import plugin="org.eclipse.etrice.core.config.ui"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.logging" version="1.0.4" match="greaterOrEqual"/>
       <import plugin="org.hamcrest.core"/>
-      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.abstractexec.behavior"/>
       <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap.ui" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etphys" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap"/>
+      <import plugin="org.eclipse.etrice.core.etmap.ui"/>
+      <import plugin="org.eclipse.etrice.core.etphys"/>
       <import plugin="org.eclipse.etrice.core.etphys.ui"/>
       <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.variables" version="3.0.0" match="compatible"/>
@@ -63,7 +63,7 @@
       <import plugin="org.eclipse.pde.core" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.frameworkadmin" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.xtext.xbase.junit"/>
-      <import plugin="org.eclipse.etrice.ui.base.tests" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.base.tests"/>
       <import plugin="org.eclipse.xtext.xbase.lib"/>
       <import plugin="org.eclipse.etrice.core.common.ui"/>
       <import plugin="org.eclipse.oomph.util" version="1.7.0" match="compatible"/>
diff --git a/features/pom.xml b/features/pom.xml
index dca419a..761668b 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,10 +17,9 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>0.0.0-SNAPSHOT</version>
 		<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
-	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.features</artifactId>
 	<packaging>pom</packaging>
 </project>
\ No newline at end of file
diff --git a/gradle/scmVersion.gradle b/gradle/scmVersion.gradle
index b416d4e..2686f78 100644
--- a/gradle/scmVersion.gradle
+++ b/gradle/scmVersion.gradle
@@ -9,17 +9,11 @@
 
 apply plugin: pl.allegro.tech.build.axion.release.ReleasePlugin
 
-if(properties.get('build.type') == 'N') {
-	ext.set('release.forceSnapshot', true)
-}
-
 scmVersion {
  	tag {
 		prefix = 'v'
 		versionSeparator = '_'
 	}
-	versionIncrementer 'incrementPrerelease'
-    versionCreator 'versionWithBranch'
 //	localOnly = false
   	checks { 
         uncommittedChanges = false
diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
index b95e7c2..da38514 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for State Machines
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.genmodel.fsm,
+  org.eclipse.etrice.generator.fsm,
  org.eclipse.emf.ecore,
- org.eclipse.xtext;bundle-version="2.6.0",
+ org.eclipse.xtext,
  org.eclipse.core.runtime,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.generator.base
 Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.etrice.abstractexec.behavior
diff --git a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
index 533dee9..c434bd9 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common eTrice DSL UI classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common.ui; singleton:=true
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.ui,
- org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.builder,
  org.antlr.runtime,
- org.eclipse.xtext.common.types.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare,
- org.eclipse.core.filesystem;bundle-version="1.3.0",
+ org.eclipse.core.filesystem,
  org.eclipse.help,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.etrice.generator.base
diff --git a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
index bcf63a9..b9e9327 100644
--- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common eTrice Grammar Fragment and Utility Classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.xtext.common.types;bundle-version="2.6.0",
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+Require-Bundle: org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.common.types,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.objectweb.asm;bundle-version="[5.0.0,7.0.0)";resolution:=optional,
+ org.objectweb.asm;resolution:=optional,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
diff --git a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/IssueUtils.java b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/IssueUtils.java
new file mode 100644
index 0000000..6fcbb23
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/IssueUtils.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2019 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * CONTRIBUTORS:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+package org.eclipse.etrice.core.common.validation;
+
+import org.eclipse.xtext.diagnostics.Diagnostic;
+import org.eclipse.xtext.diagnostics.Severity;
+import org.eclipse.xtext.validation.Issue;
+
+/**
+ * handle special data for issues blocking opening a diagram editor
+ *
+ */
+public class IssueUtils {
+
+	public static final String DUMMY_CODE = "no_special_code";
+	public static final String BLOCKING_MARKER = "blocking_marker";
+	
+	private IssueUtils() {
+		// static methods only
+	}
+	
+	public static boolean isBlocking(Issue issue) {
+		if (issue.getSeverity()==Severity.ERROR) {
+			if(Diagnostic.LINKING_DIAGNOSTIC.equals(issue.getCode())) {
+				return true;
+			}
+			for (String data : issue.getData()) {
+				if (BLOCKING_MARKER.equals(data)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
index 41d1492..8e157ed 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.config;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+Require-Bundle:  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.config;visibility:=reexport,
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.ui,
- org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.builder,
  org.antlr.runtime,
- org.eclipse.xtext.common.types.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare
 Import-Package: org.apache.commons.logging,
  org.apache.log4j,
diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
index 5085894..a0ee340 100644
--- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
+Require-Bundle:  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+ org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.apache.log4j;visibility:=reexport,
+ org.apache.commons.logging;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.xbase.lib,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.eclipse.xtext.common.types;bundle-version="2.6.0"
+ org.eclipse.xtext.common.types
 Import-Package: org.apache.commons.logging,
  org.apache.log4j,
- org.eclipse.xtend.lib;bundle-version="2.6.0",
+ org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core,
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
index 6b2c0aa..501ee06 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+Require-Bundle:  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.core.etmap;visibility:=reexport,
+  org.eclipse.etrice.core.etphys,
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.ui,
- org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.builder,
  org.antlr.runtime,
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare,
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0"
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.core.room
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.etmap.ui,
diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
index 79a524e..d0ab17c 100644
--- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+Require-Bundle:  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.etphys,
+  org.eclipse.etrice.core.genmodel.fsm,
+  org.eclipse.etrice.core.genmodel,
+ org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.xtext.util,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.generator.base
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
index cb6e6ff..8423ff3 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+Require-Bundle:  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.core.etphys;visibility:=reexport,
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.ui,
- org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.builder,
  org.antlr.runtime,
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare,
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0"
+  org.eclipse.etrice.core.common.ui
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist,
diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
index 867c164..53d512c 100644
--- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
+Require-Bundle:  org.eclipse.etrice.core.room,
+ org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
  org.antlr.runtime,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.xtext.util,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
- org.eclipse.etrice.core.common;bundle-version="2.0.0",
+  org.eclipse.etrice.core.common,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
index d43f3fa..231e17f 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.common.ui,
  org.eclipse.etrice.core.fsm;visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.ui,
- org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.builder,
  org.antlr.runtime,
- org.eclipse.xtext.common.types.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
diff --git a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
index fb03894..3a1418f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.xtext.common.types;bundle-version="2.6.0",
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+Require-Bundle:  org.eclipse.etrice.core.common,
+ org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.common.types,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional,
- com.google.guava;bundle-version="8.0.0",
+ org.objectweb.asm;resolution:=optional,
+ com.google.guava,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMJavaValidator.java b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMJavaValidator.java
index 54ae0b0..479290f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMJavaValidator.java
@@ -12,6 +12,7 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.etrice.core.common.converter.BaseConverterService;
 import org.eclipse.etrice.core.common.converter.CCStringIndentation;
+import org.eclipse.etrice.core.common.validation.IssueUtils;
 import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
 import org.eclipse.etrice.core.fsm.fSM.DetailCode;
 import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
@@ -244,6 +245,6 @@
     }
 
     private void error(Result result) {
-		error(result.getMsg(), result.getSource(), result.getFeature(), result.getIndex());
+		error(result.getMsg(), result.getSource(), result.getFeature(), result.getIndex(), IssueUtils.DUMMY_CODE, IssueUtils.BLOCKING_MARKER);
 	}
 }
diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtil.java b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtil.java
index 4a3adb0..6d8812d 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtil.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtil.java
@@ -70,6 +70,9 @@
 			return result;
 
 		if (tgt instanceof TrPointTerminal) {
+			if (((TrPointTerminal) tgt).getTrPoint().eIsProxy()) {
+				return Result.error("transition target not found", tgt, FSMPackage.eINSTANCE.getTrPointTerminal_TrPoint(), 0);
+			}
 			if (((TrPointTerminal) tgt).getTrPoint() instanceof EntryPoint)
 				return Result.error("entry point can not be transition target", tgt, FSMPackage.eINSTANCE.getTrPointTerminal_TrPoint(), 0);
 
@@ -112,10 +115,18 @@
 			// ExitPoint can be multiply connected inside a state
 		}
 		else if (tgt instanceof SubStateTrPointTerminal) {
+			if (((SubStateTrPointTerminal) tgt).getTrPoint().eIsProxy()) {
+				return Result.error("transition target not found", tgt, FSMPackage.eINSTANCE.getSubStateTrPointTerminal_TrPoint(), 0);
+			}
 			if (((SubStateTrPointTerminal) tgt).getTrPoint() instanceof ExitPoint)
 				return Result.error("sub state exit point can not be transition target", tgt, FSMPackage.eINSTANCE.getSubStateTrPointTerminal_TrPoint(), 0);
 			// sub state EntryPoint is valid as destination
 		}
+		else if (tgt instanceof StateTerminal) {
+			if (((StateTerminal) tgt).getState().eIsProxy()) {
+				return Result.error("transition target not found", tgt, FSMPackage.eINSTANCE.getStateTerminal_State(), 0);
+			}
+		}
 
 		return Result.ok();
 	}
@@ -136,6 +147,9 @@
 		}
 		else if (src instanceof TrPointTerminal) {
 			TrPoint srcTP = ((TrPointTerminal) src).getTrPoint();
+			if (srcTP.eIsProxy()) {
+				return Result.error("transition source not found", trans, FSMPackage.eINSTANCE.getTrPointTerminal_TrPoint(), 0);
+			}
 			if (srcTP instanceof ExitPoint)
 				return Result.error("exit point can not be transition source", trans, FSMPackage.eINSTANCE.getTrPointTerminal_TrPoint(), 0);
 			// TransitionPoint and EntryPoint are valid
@@ -170,6 +184,9 @@
 			}
 		}
 		else if (src instanceof SubStateTrPointTerminal) {
+			if (((SubStateTrPointTerminal) src).getTrPoint().eIsProxy()) {
+				return Result.error("transition source not found", src, FSMPackage.eINSTANCE.getSubStateTrPointTerminal_TrPoint(), 0);
+			}
 			if (((SubStateTrPointTerminal) src).getTrPoint() instanceof EntryPoint)
 				return Result.error("sub state entry point can not be transition source", src, FSMPackage.eINSTANCE.getSubStateTrPointTerminal_TrPoint(), 0);
 			// ExitPoint is valid as source
@@ -186,6 +203,11 @@
 				}
 			}
 		}
+		else if (src instanceof StateTerminal) {
+			if (((StateTerminal) src).getState().eIsProxy()) {
+				return Result.error("transition target not found", src, FSMPackage.eINSTANCE.getStateTerminal_State(), 0);
+			}
+		}
 
 		return Result.ok();
 	}
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
index 2d28991..3558b55 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.genmodel.fsm,
@@ -10,12 +10,12 @@
  org.eclipse.etrice.core.genmodel.fsm.fsmgen.impl,
  org.eclipse.etrice.core.genmodel.fsm.fsmgen.util
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0";visibility:=reexport,
+  org.eclipse.etrice.core.fsm;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
index e6d5554..44dd15e 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-Localization: plugin
@@ -13,13 +13,13 @@
  org.eclipse.etrice.core.genmodel.etricegen.impl,
  org.eclipse.etrice.core.genmodel.etricegen.util,
  org.eclipse.etrice.core.genmodel.util
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.etrice.core.room;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0";visibility:=reexport,
+Require-Bundle:  org.eclipse.etrice.core.common;visibility:=reexport,
+  org.eclipse.etrice.core.fsm;visibility:=reexport,
+  org.eclipse.etrice.core.room;visibility:=reexport,
+  org.eclipse.etrice.core.genmodel.fsm;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.etrice.core.genmodel
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index 0babd26..e176356 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.doc;bundle-version="2.0.0",
- org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
- org.eclipse.xtext.builder;bundle-version="2.6.0",
- org.antlr.runtime;bundle-version="3.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm.ui,
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.core.room;visibility:=reexport,
+  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.doc,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.builder,
+ org.antlr.runtime,
  org.eclipse.emf.codegen,
  org.eclipse.compare,
- org.eclipse.core.filesystem;bundle-version="1.3.0",
+ org.eclipse.core.filesystem,
  org.eclipse.help,
  com.google.inject,
  org.eclipse.etrice.expressions.ui,
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.ui.behavior.fsm,
+  org.eclipse.etrice.generator.base
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.ui,
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java
index 8819b3e..936e4ec 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java
@@ -16,10 +16,10 @@
 
 import org.eclipse.etrice.core.common.ui.editor.IValidatingEditor;
 import org.eclipse.etrice.core.common.ui.editor.SaveOnFocusLostListener;
+import org.eclipse.etrice.core.common.validation.IssueUtils;
 import org.eclipse.etrice.core.ui.preferences.RoomPreferenceConstants;
 import org.eclipse.help.IContextProvider;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.ui.editor.XtextEditor;
 import org.eclipse.xtext.util.CancelIndicator;
@@ -77,8 +77,12 @@
 				});
 				if (!result.isEmpty()) {
 					for (Issue issue : result) {
-						if (issue.isSyntaxError() || issue.getSeverity()==Severity.ERROR)
+						if (issue.isSyntaxError()) {
 							return false;
+						}
+						if (IssueUtils.isBlocking(issue)) {
+							return false;
+						}
 					}
 				}
 				return true;
@@ -87,19 +91,11 @@
 	}
 	
 	@Override
-	public Object getAdapter(@SuppressWarnings("rawtypes") Class key) {
-		if (key.equals(IContextProvider.class)) {
-			return new SelectedModelHelpProvider(this);
+	public <T> T getAdapter(Class<T> adapter) {
+		if (IContextProvider.class.isAssignableFrom(adapter)) {
+			return adapter.cast(new SelectedModelHelpProvider(this));
 		}
-		return super.getAdapter(key);
+		return super.getAdapter(adapter);
 
 	}
-	// TODO: with Xtext 2.15 replace with implementation below
-//	public <T> T getAdapter(Class<T> key) {
-//	if (key.equals(IContextProvider.class)) {
-//		return key.cast(new SelectedModelHelpProvider(this));
-//	}
-//	return super.getAdapter(key);
-//
-//}
 }
diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
index 0fc9fa2..d521e2a 100644
--- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.room;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
+Require-Bundle:  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.fsm,
+ org.eclipse.xtext,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
  org.eclipse.xtext.xbase.lib,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;bundle-version="4.2.1";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
- org.antlr.runtime;bundle-version="3.0.0",
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
+ org.antlr.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+  org.eclipse.etrice.core.genmodel.fsm,
  org.eclipse.etrice.generator.base
 Import-Package: org.apache.log4j,
  org.eclipse.etrice.core.room
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
index 2353dfc..0357a29 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
@@ -160,7 +160,7 @@
 		if (path != null)
 			return path;
 
-		return fallback.getFragment(obj);
+		return fallback!=null ? fallback.getFragment(obj) : null;
 	}
 	
 	protected String getFragment(EObject obj) {
@@ -182,19 +182,21 @@
 	}
 
 	public static boolean isActorClass(String fragment) {
-		if (fragment.startsWith(RoomPackage.eINSTANCE.getActorClass().getName()))
+		if (fragment!=null && fragment.startsWith(RoomPackage.eINSTANCE.getActorClass().getName()))
 			return true;
 
 		return false;
 	}
 
 	public static boolean isStructureClass(String fragment) {
-		if (fragment.startsWith(RoomPackage.eINSTANCE.getActorClass().getName()))
-			return true;
-		if (fragment.startsWith(RoomPackage.eINSTANCE.getSubSystemClass().getName()))
-			return true;
-		if (fragment.startsWith(RoomPackage.eINSTANCE.getLogicalSystem().getName()))
-			return true;
+		if (fragment!=null) {
+			if (fragment.startsWith(RoomPackage.eINSTANCE.getActorClass().getName()))
+				return true;
+			if (fragment.startsWith(RoomPackage.eINSTANCE.getSubSystemClass().getName()))
+				return true;
+			if (fragment.startsWith(RoomPackage.eINSTANCE.getLogicalSystem().getName()))
+				return true;
+		}
 
 		return false;
 	}
@@ -239,6 +241,10 @@
 	}
 
 	protected EObject getEObject(RoomModel model, String fragment) {
+		if (fragment==null) {
+			return null;
+		}
+		
 		int begin = 0;
 		int end = fragment.indexOf(TYPE_SEP);
 		if (end<0)
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/RoomJavaValidator.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/RoomJavaValidator.java
index b9089e5..9334c48 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/RoomJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/RoomJavaValidator.java
@@ -36,6 +36,7 @@
 import org.eclipse.etrice.core.common.base.Import;
 import org.eclipse.etrice.core.common.base.LiteralType;
 import org.eclipse.etrice.core.common.base.util.ImportHelpers;
+import org.eclipse.etrice.core.common.validation.IssueUtils;
 import org.eclipse.etrice.core.common.validation.ValidationHelpers;
 import org.eclipse.etrice.core.common.validation.ValidationHelpers.NamedObject;
 import org.eclipse.etrice.core.common.validation.ValidationHelpers.NamedObjectList;
@@ -212,7 +213,7 @@
 			ActorClass ac = (ActorClass) ar.eContainer();
 
 			if (roomHelpers.isReferencing(ar.getType(), ac)) {
-				error("Actor reference is circular", RoomPackage.eINSTANCE.getActorRef_Type());
+				error("Actor reference is circular", RoomPackage.eINSTANCE.getActorRef_Type(), IssueUtils.DUMMY_CODE, IssueUtils.BLOCKING_MARKER);
 			}
 		}
 
@@ -814,7 +815,7 @@
 
 
 	private void error(Result result) {
-		error(result.getMsg(), result.getSource(), result.getFeature(), result.getIndex());
+		error(result.getMsg(), result.getSource(), result.getFeature(), result.getIndex(), IssueUtils.DUMMY_CODE, IssueUtils.BLOCKING_MARKER);
 	}
 
 	@Check
diff --git a/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF
index 1507f12..8a50b2e 100644
--- a/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.dctools.fsm/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Detail Code Tools for FSM
 Bundle-SymbolicName: org.eclipse.etrice.dctools.fsm
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Automatic-Module-Name: org.eclipse.etrice.dctools.fsm
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.jface.text,
- org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.6.0",
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
  org.eclipse.xtext.ui,
  org.eclipse.etrice.core.fsm,
  org.eclipse.etrice.generator
diff --git a/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF
index 1419588..f2442ef 100644
--- a/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.dctools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Detail Code Tools
 Bundle-SymbolicName: org.eclipse.etrice.dctools
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Automatic-Module-Name: org.eclipse.etrice.dctools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
index 68fc1dd..dd47836 100644
--- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Documentation
 Bundle-SymbolicName: org.eclipse.etrice.doc;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
index bbee733..fc007d3 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: etUnit File Converter
 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF
index 39e95a4..5dc11cc 100644
--- a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Expressions UI
 Bundle-SymbolicName: org.eclipse.etrice.expressions.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface.text,
  org.eclipse.xtext.xbase.lib,
diff --git a/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF
index ab1a0da..dbbd292 100644
--- a/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF
@@ -1,16 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.etrice.generator.base
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.ecore,
- com.google.inject;bundle-version="3.0.0",
+ com.google.inject,
  org.eclipse.xtext.generator,
  org.eclipse.xtext.util,
  org.eclipse.xtext,
  org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.apache.commons.io
+ org.eclipse.core.runtime
 Export-Package: org.eclipse.etrice.generator.base,
  org.eclipse.etrice.generator.base.args,
  org.eclipse.etrice.generator.base.cli,
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index b5346d4..700e45f 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.config;bundle-version="2.0.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.xtext.generator;bundle-version="2.6.0",
- org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.core.etphys,
+  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.config,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.util,
+  org.eclipse.etrice.generator.base,
  org.eclipse.etrice.generator.config
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
index e62e4d4..25d6705 100644
--- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Config
 Bundle-SymbolicName: org.eclipse.etrice.generator.config;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.config;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- com.google.guava;bundle-version="8.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.6.0"
+Require-Bundle:  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.config,
+  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.base,
+ org.eclipse.xtend.lib,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib
 Export-Package: org.eclipse.etrice.generator.config
 Automatic-Module-Name: org.eclipse.etrice.generator.config
 
diff --git a/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/MANIFEST.MF
index 7d3a965..3905b25 100644
--- a/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Contract Monitor Generator
 Bundle-SymbolicName: org.eclipse.etrice.generator.contractmonitor;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Export-Package: org.eclipse.etrice.generator.contractmonitor,
  org.eclipse.etrice.generator.contractmonitor.setup
 Bundle-Vendor: Eclipse eTrice
@@ -15,3 +15,5 @@
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro,
  org.eclipse.xtext
+Automatic-Module-Name: org.eclipse.etrice.generator.contractmonitor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
index f25a857..7ed0172 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C++ Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.cpp;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.config;bundle-version="2.0.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.xtext.generator;bundle-version="2.6.0",
- org.eclipse.xtext.util;bundle-version="2.6.0",
+Require-Bundle:  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.core.etphys,
+  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.config,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.util,
  org.eclipse.etrice.core.genmodel.fsm,
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.generator.base
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.cpp,
diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
index 3437cb2..e829916 100644
--- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Document Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.xtext.generator;bundle-version="2.6.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="2.0.0"
+Require-Bundle:  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.core.genmodel.fsm,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.core.etphys,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.generator,
+  org.eclipse.etrice.generator.base,
+  org.eclipse.etrice.abstractexec.behavior
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.doc;uses:="org.eclipse.etrice.generator.base",
diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
index 9dff0de..70f20d3 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator for Finite State Machines
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsm
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.fsm.base,
  org.eclipse.etrice.generator.fsm.generic
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.genmodel.fsm,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+ org.eclipse.xtend.lib,
+  org.eclipse.etrice.generator.base
 Import-Package: org.eclipse.core.runtime
 Automatic-Module-Name: org.eclipse.etrice.generator.fsm
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
index f838064..42baa15 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.generator.fsmtest;visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.ui,
- org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.builder,
  org.antlr.runtime,
- org.eclipse.xtext.common.types.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
index 6e5be66..06f8d1c 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+Require-Bundle: org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.xtext.util,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.eclipse.xtext.common.types;bundle-version="2.6.0"
+ org.eclipse.xtext.common.types
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
index ab79871..7bf6f43 100644
--- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.config;bundle-version="2.0.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.xtext.generator;bundle-version="2.6.0",
- org.eclipse.xtext.util;bundle-version="2.6.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+Require-Bundle:  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.core.etphys,
+  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.config,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.util,
+  org.eclipse.etrice.generator.base
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.java,
diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
index 822ebd8..c9c5458 100644
--- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.c;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.c.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.c;bundle-version="2.0.0",
- org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.fsm,
+ org.eclipse.etrice.generator.c,
+  org.eclipse.etrice.generator.launch,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.eclipse.jdt.core;bundle-version="3.7.0",
- org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.generator.ui;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+ org.eclipse.jdt.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.core.variables,
+  org.eclipse.etrice.generator.ui,
+  org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.launching,
diff --git a/plugins/org.eclipse.etrice.generator.launch.contractmonitor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.contractmonitor/META-INF/MANIFEST.MF
index 26a70fa..39e6cb7 100644
--- a/plugins/org.eclipse.etrice.generator.launch.contractmonitor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.contractmonitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Contract Monitor Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.contractmonitor;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse eTrice
@@ -19,3 +19,4 @@
 Import-Package: org.eclipse.jdt.launching,
  org.eclipse.ui.dialogs
 Export-Package: org.eclipse.etrice.generator.launch.contractmonitor
+Automatic-Module-Name: org.eclipse.etrice.generator.launch.contractmonitor
diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
index 83d4fc1..776abbd 100644
--- a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Cpp Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.cpp;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.cpp.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.cpp;bundle-version="2.0.0",
- org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator.cpp,
+  org.eclipse.etrice.generator.launch,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.eclipse.jdt.core;bundle-version="3.7.0",
- org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+ org.eclipse.jdt.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.core.variables,
+  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.launching,
diff --git a/plugins/org.eclipse.etrice.generator.launch.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.doc/META-INF/MANIFEST.MF
index bc57860..7aa8e58 100644
--- a/plugins/org.eclipse.etrice.generator.launch.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.doc/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Doc Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.doc;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.doc.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.doc;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.doc,
+  org.eclipse.etrice.generator.base,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.etrice.generator.launch,
diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
index 18ca421..94769d0 100644
--- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.java;bundle-version="2.0.0",
- org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator.java,
+  org.eclipse.etrice.generator.launch,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.eclipse.jdt.core;bundle-version="3.7.0",
- org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.generator.ui;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+ org.eclipse.jdt.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.core.variables,
+  org.eclipse.etrice.generator.ui,
+  org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jdt.launching,
diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
index 2c496aa..597b854 100644
--- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Launch Base Classes
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.fsm,
+  org.eclipse.etrice.generator.ui,
+  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.room.ui,
  org.eclipse.ui,
  org.eclipse.ui.console,
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.ui,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.eclipse.core.variables,
  org.eclipse.jdt.launching,
  org.eclipse.ui.ide,
- org.eclipse.etrice.generator.base;bundle-version="2.0.0",
+  org.eclipse.etrice.generator.base,
  org.eclipse.etrice.core.common.ui
 Import-Package: org.eclipse.xtext.xbase.lib
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
index 7fe5f53..5d88e93 100644
--- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CDT integration of eTrice
 Bundle-SymbolicName: org.eclipse.etrice.generator.ui.cdt;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="2.0.0",
- org.eclipse.cdt.core;bundle-version="5.5.0",
- org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0",
- org.eclipse.equinox.common;bundle-version="3.6.200",
- org.eclipse.ui.workbench;bundle-version="3.106.0",
- org.eclipse.equinox.preferences;bundle-version="3.5.200",
- org.eclipse.core.commands;bundle-version="3.6.100",
- org.eclipse.ui.ide;bundle-version="3.10.0",
+Require-Bundle: org.eclipse.etrice.generator.ui,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.equinox.common,
+ org.eclipse.ui.workbench,
+ org.eclipse.equinox.preferences,
+ org.eclipse.core.commands,
+ org.eclipse.ui.ide,
  org.eclipse.emf.common,
  org.eclipse.emf.common.ui,
- org.eclipse.core.runtime;bundle-version="3.10.0"
+ org.eclipse.core.runtime
 Import-Package: org.eclipse.core.resources,
  org.eclipse.core.runtime.jobs
 Bundle-Activator: org.eclipse.etrice.generator.ui.cdt.Activator
diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
index 0cbf26b..7788268 100644
--- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator UI
 Bundle-SymbolicName: org.eclipse.etrice.generator.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common;bundle-version="2.0.0",
- org.eclipse.etrice.ui.runtime;bundle-version="2.0.0",
- org.eclipse.etrice.core.common;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.core.etmap.ui,
+  org.eclipse.etrice.core.etphys,
+  org.eclipse.etrice.core.etphys.ui,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.ui.common,
+  org.eclipse.etrice.ui.runtime,
+  org.eclipse.etrice.core.common,
  org.eclipse.core.runtime,
  org.eclipse.ui,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.core.resources;bundle-version="3.8.100",
+ org.apache.log4j,
+ org.eclipse.core.resources,
  org.eclipse.emf.ecore,
- org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.jdt.core;bundle-version="3.9.0",
- org.eclipse.jdt.launching;bundle-version="3.7.0",
- org.eclipse.ui.ide;bundle-version="3.9.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+  org.eclipse.etrice.core.room.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.ui.ide,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext,
+ org.eclipse.xtext.ui,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.base
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.etrice.generator.ui.Activator
 Export-Package: org.eclipse.etrice.generator.ui.configurator,
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index 5ce2f99..a26a6ab 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -2,27 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Model
 Bundle-SymbolicName: org.eclipse.etrice.generator;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator.base,
  org.eclipse.etrice.generator.generic
-Require-Bundle: org.eclipse.etrice.generator.base;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
+Require-Bundle: org.eclipse.etrice.generator.base,
+ org.eclipse.etrice.core.room,
+ org.eclipse.etrice.core.genmodel,
+ org.eclipse.etrice.core.etmap,
+ org.eclipse.etrice.core.etphys,
+ org.eclipse.etrice.generator.fsm,
+ org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.xtext.generator;bundle-version="2.6.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.xtend.lib;bundle-version="2.3.0",
- org.apache.commons.io;bundle-version="2.0.1",
+ org.eclipse.core.resources,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext,
+ org.eclipse.xtend.lib,
  org.eclipse.etrice.core.config
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.etrice.generator.generic
 Automatic-Module-Name: org.eclipse.etrice.generator
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index efc993c..c5bd24e 100644
--- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Logging Fragment
 Bundle-SymbolicName: org.eclipse.etrice.logging
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
-Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
+Fragment-Host: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.etrice.logging
diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
index 789b6cd..bfad6fb 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM Action Code Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.actioneditor;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.actioneditor.Activator
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.ui.behavior;bundle-version="2.0.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.ui.behavior,
+  org.eclipse.etrice.ui.behavior.fsm,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.common,
@@ -17,11 +17,11 @@
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro,
- com.google.guava;bundle-version="8.0.0",
+ com.google.guava,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.etrice.core.room.ui,
- org.eclipse.etrice.expressions.ui;bundle-version="2.0.0",
+  org.eclipse.etrice.expressions.ui,
  org.eclipse.ui.editors
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
index 6ea109d..b93a723 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract FSM Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.fsm;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.fsm.Activator
 Bundle-Vendor: eTrice
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.graphiti.ui;bundle-version="0.8.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.gef;bundle-version="3.6.1",
+Require-Bundle:  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.genmodel.fsm,
+  org.eclipse.etrice.core.fsm.ui,
+ org.eclipse.graphiti,
+ org.eclipse.graphiti.ui,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.core.databinding,
+ org.eclipse.gef,
  org.eclipse.emf.transaction,
- org.eclipse.xtext.ui;bundle-version="2.7.0",
- org.eclipse.xtend.lib;bundle-version="2.7.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.7.0",
- org.eclipse.etrice.expressions.ui;bundle-version="2.0.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.7.0"
+ org.eclipse.xtext.ui,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtext.ui.shared,
+  org.eclipse.etrice.expressions.ui,
+ org.eclipse.xtext.ui.shared
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.etrice.ui.behavior.fsm,
diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
index adb25f3..ade3a03 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Actor Behavior Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.Activator
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common;bundle-version="2.0.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.graphiti.ui;bundle-version="0.8.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.gef;bundle-version="3.6.1",
+Require-Bundle:  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.ui.common,
+  org.eclipse.etrice.ui.behavior.fsm,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.fsm.ui,
+ org.eclipse.graphiti,
+ org.eclipse.graphiti.ui,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.core.databinding,
+ org.eclipse.gef,
  org.eclipse.emf.transaction,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.eclipse.etrice.expressions.ui;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0"
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+  org.eclipse.etrice.abstractexec.behavior,
+  org.eclipse.etrice.core.genmodel,
+  org.eclipse.etrice.expressions.ui,
+  org.eclipse.etrice.generator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
index e0adbf3..d571f3d 100644
--- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Commands
 Bundle-SymbolicName: org.eclipse.etrice.ui.commands; singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.commands.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.graphiti.ui;bundle-version="0.8.0",
- org.eclipse.gef;bundle-version="3.7.0",
- org.eclipse.ui.ide;bundle-version="3.7.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.ui.common,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.ui.behavior.fsm,
+ org.eclipse.graphiti,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.xtext.ui,
+ org.eclipse.graphiti.ui,
+ org.eclipse.gef,
+ org.eclipse.ui.ide,
  org.eclipse.xtext.ui.shared
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
index 1caac8f..9a2a39b 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Base for UI
 Bundle-SymbolicName: org.eclipse.etrice.ui.common.base;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.common.base.UIBaseActivator
 Bundle-Vendor: eTrice
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm.ui;bundle-version="2.0.0",
- org.eclipse.etrice.doc;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.core.fsm.ui,
+  org.eclipse.etrice.doc,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.transaction,
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
- org.eclipse.xtend.lib;bundle-version="2.6.0",
+ org.eclipse.graphiti,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtend.lib,
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.core.databinding.property;bundle-version="1.4.200",
- org.eclipse.jdt.core;bundle-version="3.9.0",
- org.eclipse.graphiti.ui;bundle-version="0.7.0",
- org.eclipse.gef;bundle-version="3.6.1",
- org.eclipse.ui.forms;bundle-version="3.6.1",
+ org.eclipse.core.databinding.property,
+ org.eclipse.jdt.core,
+ org.eclipse.graphiti.ui,
+ org.eclipse.gef,
+ org.eclipse.ui.forms,
  org.eclipse.emf.workspace,
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.ui.ide;bundle-version="3.9.2",
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.ui.ide,
  org.eclipse.help
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
index d6c4529..c4a193e 100644
--- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UI Common
 Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.ui.common.base,
  org.eclipse.emf.transaction,
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.graphiti.ui;bundle-version="0.7.0",
- org.eclipse.gef;bundle-version="3.6.1",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+ org.eclipse.graphiti,
+ org.eclipse.ui.ide,
+ org.eclipse.graphiti.ui,
+ org.eclipse.gef,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.core.databinding.property;bundle-version="1.4.200",
- org.eclipse.jdt.core;bundle-version="3.9.0",
+ org.eclipse.core.databinding.property,
+ org.eclipse.jdt.core,
  org.eclipse.emf.workspace
 Export-Package: org.eclipse.etrice.ui.common,
  org.eclipse.etrice.ui.common.commands,
diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
index 2fa41ee..f3c3797 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: New Wizards for Runtime
 Bundle-SymbolicName: org.eclipse.etrice.ui.runtime;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.ui.runtime/pom.xml b/plugins/org.eclipse.etrice.ui.runtime/pom.xml
index 977a27b..170f9dc 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/pom.xml
+++ b/plugins/org.eclipse.etrice.ui.runtime/pom.xml
@@ -16,10 +16,9 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>0.0.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
-	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.ui.runtime</artifactId>
 	<packaging>eclipse-plugin</packaging>
   
diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
index aa2753b..8a1d1a3 100644
--- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Actor Structure Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.structure;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.structure.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room.ui;bundle-version="2.0.0",
- org.eclipse.etrice.core.common.ui;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common;bundle-version="2.0.0",
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.graphiti.ui;bundle-version="0.8.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.gef;bundle-version="3.6.1",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room.ui,
+  org.eclipse.etrice.core.common.ui,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.ui.common,
+ org.eclipse.graphiti,
+ org.eclipse.graphiti.ui,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.core.databinding,
+ org.eclipse.gef,
  org.eclipse.emf.transaction,
- org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
  org.eclipse.jface.databinding,
- org.eclipse.core.databinding.beans;bundle-version="1.2.200"
+ org.eclipse.core.databinding.beans
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.etrice.ui.structure,
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a80b9ee..0546ea5 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -17,10 +17,9 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>0.0.0-SNAPSHOT</version>
 		<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
-	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.plugins</artifactId>
 	<packaging>pom</packaging>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9dd0e0b..c23c4eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,13 +15,18 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	
-	<groupId>org.eclipse.etrice</groupId>
+	<parent>
+		<groupId>org.eclipse.etrice</groupId>
+		<artifactId>org.eclipse.etrice.parent</artifactId>
+		<version>0.0.0-SNAPSHOT</version>
+		<relativePath>releng/org.eclipse.etrice.parent</relativePath>
+	</parent>
+	
 	<artifactId>org.eclipse.etrice</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
-	
+		
 		<!-- Plugins -->
 		<module>plugins/org.eclipse.etrice.abstractexec.behavior</module>
 		<module>plugins/org.eclipse.etrice.core.common</module>
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 91dbb1d..2e5b5c1 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.parent</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>0.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -29,7 +29,6 @@
 		<eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
 		<xtext.url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtext.version}</xtext.url>
 		<license.url>http://download.eclipse.org/cbi/updates/license</license.url>
-		<orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url>
 		<cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url>
 		<etrice.url>http://download.eclipse.org/etrice/updates/nightly</etrice.url>
 
@@ -52,11 +51,6 @@
 			<url>${license.url}</url>
 			<layout>p2</layout>
 		</repository>
-		<repository>
-			<id>orbit</id>
-			<url>${orbit.url}</url>
-			<layout>p2</layout>
-		</repository>
 	</repositories>
 
 	<pluginRepositories>
@@ -104,6 +98,7 @@
 				<version>${tycho.version}</version>
 				<configuration>
 					<format>'${build.type}'yyyyMMddHHmm</format>
+					<strictVersions>false</strictVersions>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/releng/org.eclipse.etrice.releng/build.gradle b/releng/org.eclipse.etrice.releng/build.gradle
index c3ad58b..4b2a969 100644
--- a/releng/org.eclipse.etrice.releng/build.gradle
+++ b/releng/org.eclipse.etrice.releng/build.gradle
@@ -1,7 +1,3 @@
-plugins {
-	id 'org.hidetake.ssh' version '2.10.1'
-}
-
 configurations {
 	archives
 	updates
@@ -16,11 +12,7 @@
 	updates project(path: ':releng:org.eclipse.etrice.site', configuration: 'archive')
 }
 
-def isSnapshot = version.endsWith('SNAPSHOT')
-def versionDir = version
-if(isSnapshot) {
-	versionDir = 'nightly'
-}
+def versionDir = scmVersion.version.endsWith('SNAPSHOT') ? 'nightly' : scmVersion.version
 def downloadDir = '/home/data/httpd/download.eclipse.org/etrice'
 def promoteDir = "$downloadDir/$versionDir"
 def assembleDir = "$buildDir/$versionDir"
@@ -53,6 +45,8 @@
 	into assembleDir
 }
 
+assemble.dependsOn assembleArtifacts
+
 task promote {
 	dependsOn assembleArtifacts
 	doLast {
diff --git a/releng/org.eclipse.etrice.site/build.gradle b/releng/org.eclipse.etrice.site/build.gradle
index 991070c..0867a1a 100644
--- a/releng/org.eclipse.etrice.site/build.gradle
+++ b/releng/org.eclipse.etrice.site/build.gradle
@@ -2,7 +2,63 @@
 	archive
 }
 
-artifacts {
-	archive fileTree(dir: 'target', include: 'org.eclipse.etrice.site-*.zip').files
+task updateVersionStrings {
+	doLast {
+		def manifestVersion = "${scmVersion.undecoratedVersion}.qualifier"
+		// Replace plugin versions
+		ant.replaceregexp(
+			match: "Bundle-Version:\\s*[\\w.-]*",
+			replace: "Bundle-Version: $manifestVersion") {
+			fileset(dir: rootDir, includes: '**/MANIFEST.MF')
+		}
+		// Replace feature versions
+		ant.replaceregexp(
+			match: "(?s)<feature(.*?)version\\s*=\\s*\"[\\w.-]*\"(.*)>",
+			replace: "<feature\\1version=\"$manifestVersion\"\\2>") {
+			fileset(dir: rootDir, includes: '**/feature.xml')
+		}
+		// Replace first occurence of version tag in poms
+		ant.replaceregexp(
+			match: "(?s)(.*?)<version>[\\w.-]*</version>(.*)",
+			replace: "\\1<version>$version</version>\\2") {
+			fileset(dir: rootDir, includes: '**/pom.xml')
+		}
+	}
 }
 
+task runMaven(type: MavenExec, dependsOn: updateVersionStrings) {
+	workingDir rootDir
+	goals 'clean', 'verify'
+	options {
+		define = ['build.type' : version.endsWith('SNAPSHOT') ? 'N' : 'R']
+		if(findProperty('sign') != null) {
+			activateProfiles = ['sign']
+		}
+	}
+}
+
+def maven = findProperty('maven')
+if(maven != null) {
+	if(!maven.empty) {
+		runMaven.mavenDir = rootProject.file(maven)
+	}
+}
+else {
+	updateVersionStrings.enabled = false
+	runMaven.enabled = false
+}
+
+def siteZipName = "${project.name}-${version}.zip"
+
+task copySiteZip(type: Copy, dependsOn: runMaven) {
+	from 'target'
+	include "${project.name}-*.zip"
+	into buildDir
+	rename { siteZipName }
+}
+
+artifacts {
+	archive(layout.buildDirectory.file(siteZipName)) {
+		builtBy copySiteZip
+	}
+}
\ No newline at end of file
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 8819870..2d92b51 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.etrice.feature" version="2.0.0.qualifier">
+   <feature id="org.eclipse.etrice.feature">
       <category name="org.eclipse.etrice"/>
    </feature>
-   <feature id="org.eclipse.etrice.cdt_integration.feature" version="2.0.0.qualifier">
+   <feature id="org.eclipse.etrice.cdt_integration.feature">
       <category name="org.eclipse.etrice"/>
    </feature>
    <category-def name="org.eclipse.etrice" label="eTrice">
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
index 93b32e8..c39a493 100644
--- a/releng/org.eclipse.etrice.site/pom.xml
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -17,11 +17,10 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>0.0.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	
-	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.site</artifactId>
 	<packaging>eclipse-repository</packaging>
 	
diff --git a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
index 325a9e5..ae1ef7c 100644
--- a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java ModelLib
 Bundle-SymbolicName: org.eclipse.etrice.modellib.java
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.etrice.modellib.java
diff --git a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
index 3127632..19a5575 100644
--- a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Runtime
 Bundle-SymbolicName: org.eclipse.etrice.runtime.java
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Export-Package: org.eclipse.etrice.runtime.java.config,
  org.eclipse.etrice.runtime.java.debugging,
  org.eclipse.etrice.runtime.java.etunit,
diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
index 8de00ed..0ef9342 100644
--- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for Behavior Tests
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.abstractexec.behavior,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.junit;bundle-version="4.10.0",
+ com.google.inject,
+ org.eclipse.xtext,
+ org.junit,
  org.eclipse.etrice.core.room
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
index 32790e7..2c3759f 100644
--- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for common eTrice grammar fragments and classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common,
@@ -10,15 +10,15 @@
  org.eclipse.xtext.xbase.lib,
  org.eclipse.etrice.core.common.ui,
  org.eclipse.ui.workbench;resolution:=optional,
- org.eclipse.xtext.testing;bundle-version="2.12.0",
- org.eclipse.xtext.junit4;bundle-version="2.12.0"
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.junit4
 Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
+ org.junit,
+ org.junit.runner,
+ org.junit.runner.manipulation,
+ org.junit.runner.notification,
+ org.junit.runners,
+ org.junit.runners.model,
  org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.common.tests,
diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
index 5c0588b..4e427ab 100644
--- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL Tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.config;bundle-version="2.0.0",
- org.eclipse.etrice.core.config.ui;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.config,
+  org.eclipse.etrice.core.config.ui,
  org.eclipse.core.runtime,
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.xtext.junit4;bundle-version="2.6.0",
+ org.eclipse.xtext,
+ org.eclipse.xtext.junit4,
  org.junit,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.apache.commons.logging,
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
+ org.junit.runner,
+ org.junit.runner.manipulation,
+ org.junit.runner.notification,
+ org.junit.runners,
+ org.junit.runners.model,
  org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
index f11c38e..ceb6cac 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="2.0.0",
- org.eclipse.etrice.core.etmap.ui;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.etmap,
+  org.eclipse.etrice.core.etmap.ui,
  org.eclipse.core.runtime,
- org.eclipse.xtext.junit4;bundle-version="2.6.0",
+ org.eclipse.xtext.junit4,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
+ org.junit,
+ org.junit.runner,
+ org.junit.runner.manipulation,
+ org.junit.runner.notification,
+ org.junit.runners,
+ org.junit.runners.model,
  org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.etmap
diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
index fb4f870..c0c4b21 100644
--- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.etphys,
  org.eclipse.etrice.core.etphys.ui,
  org.eclipse.core.runtime,
- org.eclipse.xtext.junit4;bundle-version="2.6.0",
+ org.eclipse.xtext.junit4,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
+ org.junit,
+ org.junit.runner,
+ org.junit.runner.manipulation,
+ org.junit.runner.notification,
+ org.junit.runners,
+ org.junit.runners.model,
  org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.etphys
diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
index 7ad3102..bd58b34 100644
--- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL Tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common,
  org.eclipse.etrice.core.fsm,
  org.eclipse.etrice.core.fsm.ui,
  org.eclipse.core.runtime,
- org.eclipse.xtext.junit4;bundle-version="2.6.0",
+ org.eclipse.xtext.junit4,
  org.eclipse.ui.workbench;resolution:=optional,
- org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional,
+ org.objectweb.asm;resolution:=optional,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
+ org.junit,
+ org.junit.runner,
+ org.junit.runner.manipulation,
+ org.junit.runner.notification,
+ org.junit.runners,
+ org.junit.runners.model,
  org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.core.fsm
diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF
index e50e943..75ee574 100644
--- a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM GenModel Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.osgi;bundle-version="3.11.2",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.room.tests;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+Require-Bundle: org.junit,
+ org.eclipse.osgi,
+ org.eclipse.core.runtime,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.room.tests,
+  org.eclipse.etrice.core.genmodel.fsm,
+  org.eclipse.etrice.generator.base
 Bundle-Activator: org.eclipse.etrice.core.genmodel.fsm.tests.FSMGenModelTestsActivator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.etrice.core.genmodel.fsm.tests
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
index 2d3c9c7..681d686 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel;bundle-version="2.0.0",
- org.junit;bundle-version="4.8.1",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0"
+Require-Bundle:  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.genmodel,
+ org.junit,
+ org.eclipse.xtext,
+ org.eclipse.core.runtime,
+  org.eclipse.etrice.generator.base
 Bundle-Activator: org.eclipse.etrice.core.genmodel.GenmodelTestsActivator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.etrice.core.genmodel.tests
diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
index 7272165..9952848 100644
--- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Room Core Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.room.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.junit;bundle-version="4.8.1",
+Require-Bundle:  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.fsm,
+ org.junit,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
- org.eclipse.osgi;bundle-version="3.6.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.osgi,
+ org.eclipse.xtext,
+ org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.xtext.testing;bundle-version="2.12.0"
+ org.eclipse.xtext.testing
 Bundle-Activator: org.eclipse.etrice.core.CoreTestsActivator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.etrice.core
diff --git a/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF
index 2b72d17..a599bf7 100644
--- a/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.dctools.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Expressions UI Tests
 Bundle-SymbolicName: org.eclipse.etrice.dctools.tests;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Automatic-Module-Name: org.eclipse.etrice.expressions.ui.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.jface.text;bundle-version="3.12.2",
- org.eclipse.core.runtime;bundle-version="3.13.0",
+Require-Bundle: org.junit,
+ org.eclipse.jface.text,
+ org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
  com.google.guava,
  org.eclipse.etrice.dctools,
diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
index 2d87b0b..746f172 100644
--- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: etUnit Converter Tests
 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.etunit.converter,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.8.2",
+ org.junit,
  com.google.guava
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
index 68fa8e9..e0b2fb0 100644
--- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsmtest.ui;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.generator.fsmtest,
+  org.eclipse.etrice.generator.fsmtest.ui,
  org.eclipse.core.runtime,
- org.eclipse.xtext.junit4;bundle-version="2.6.0",
+ org.eclipse.xtext.junit4,
  org.eclipse.ui.workbench;resolution:=optional
 Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
+ org.junit,
+ org.junit.runner,
+ org.junit.runner.manipulation,
+ org.junit.runner.notification,
+ org.junit.runners,
+ org.junit.runners.model,
  org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.etrice.generator
diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
index 2e098df..95259bb 100644
--- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Model Tests
 Bundle-SymbolicName: org.eclipse.etrice.generator.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0",
- org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.generator;bundle-version="2.0.0",
- org.eclipse.etrice.generator.fsm;bundle-version="2.0.0",
- org.junit;bundle-version="4.8.1",
- org.eclipse.osgi;bundle-version="3.6.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0"
+Require-Bundle:  org.eclipse.etrice.core.common,
+  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.generator,
+  org.eclipse.etrice.generator.fsm,
+ org.junit,
+ org.eclipse.osgi,
+ org.eclipse.xtext,
+ org.eclipse.core.runtime
 Bundle-Activator: org.eclipse.etrice.generator.InstanceTestsActivator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.etrice.generator.tests
diff --git a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
index 02a5bb8..3131d1e 100644
--- a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Diagram Test Base Classes
 Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.junit;bundle-version="4.8.1",
+Bundle-Version: 0.0.0.qualifier
+Require-Bundle: org.junit,
  org.eclipse.core.runtime,
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.ui.structure;bundle-version="2.0.0",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.graphiti;bundle-version="0.8.0",
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.ui.structure,
+ org.eclipse.xtext,
+ org.eclipse.graphiti,
  org.eclipse.etrice.ui.common.base,
  com.google.guava,
  org.eclipse.xtext.xbase.lib,
diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
index a54e8e1..ca84aa4 100644
--- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Behavior Diagram Tests
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 0.0.0.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.ui.behavior;bundle-version="2.0.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.ui.base.tests;bundle-version="2.0.0",
- org.eclipse.etrice.generator.launch;bundle-version="2.0.0",
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.ui.behavior,
+  org.eclipse.etrice.ui.behavior.fsm,
+  org.eclipse.etrice.ui.common,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.ui.base.tests,
+  org.eclipse.etrice.generator.launch,
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.8.1",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.graphiti;bundle-version="0.8.0",
- org.eclipse.etrice.core.room.tests;bundle-version="2.0.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.generator.base;bundle-version="2.0.0",
+ org.junit,
+ org.eclipse.xtext,
+ org.eclipse.graphiti,
+  org.eclipse.etrice.core.room.tests,
+  org.eclipse.etrice.core.genmodel.fsm,
+  org.eclipse.etrice.generator.base,
  org.eclipse.core.resources
 Import-Package: org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
index 484601a..a8c8f45 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Structure Diagram Tests
 Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
- org.eclipse.etrice.core.room;bundle-version="2.0.0",
- org.eclipse.etrice.ui.structure;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common;bundle-version="2.0.0",
- org.eclipse.etrice.ui.common.base;bundle-version="2.0.0",
- org.eclipse.etrice.ui.base.tests;bundle-version="2.0.0",
+Bundle-Version: 0.0.0.qualifier
+Require-Bundle:  org.eclipse.etrice.core.fsm,
+  org.eclipse.etrice.core.room,
+  org.eclipse.etrice.ui.structure,
+  org.eclipse.etrice.ui.common,
+  org.eclipse.etrice.ui.common.base,
+  org.eclipse.etrice.ui.base.tests,
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.8.1",
- org.eclipse.xtext;bundle-version="2.6.0",
- org.eclipse.graphiti;bundle-version="0.8.0"
+ org.junit,
+ org.eclipse.xtext,
+ org.eclipse.graphiti
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse eTrice
 Bundle-ActivationPolicy: lazy
diff --git a/tests/pom.xml b/tests/pom.xml
index d6c30be..8ae4ab8 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -17,10 +17,9 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>org.eclipse.etrice.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>0.0.0-SNAPSHOT</version>
 		<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
-	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>org.eclipse.etrice.tests</artifactId>
 	<packaging>pom</packaging>