diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
index 3b8cf34..32e714f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@
  org.eclipse.ui.console;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="4.0.0",
  org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka.async.fuml,
  org.eclipse.papyrus.moka.async.fuml.Semantics.Classes.Kernel,
@@ -19,7 +19,7 @@
  org.eclipse.papyrus.moka.async.fuml.debug
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka fUML Multi-threaded Execution Engine
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.async.fuml.Activator
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/pom.xml
index 77233ab..c69db1f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/pom.xml
@@ -7,12 +7,11 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.async.fuml</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.async.fuml</name>
 	<description>Multi-threaded implementation of fUML execution engine</description>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
index f290936..3e34638 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Composites Interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.composites.interfaces
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.composites.interfaces.Activator
-Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
+Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/pom.xml
index fd115ba..f8fdf61 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.eclipse.papyrus.moka</groupId>
   	<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-  	<version>3.0.0-SNAPSHOT</version>
+  	<version>4.0.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
index 80e35c8..5b15f9c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
+Require-Bundle: org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka.composites,
@@ -17,7 +17,7 @@
  org.eclipse.papyrus.moka.composites.extensions.Semantics.InvocationActions
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka Composites Execution Engine
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.composites.Activator
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.composites/pom.xml
index 498ad20..61b84ba 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
index 5ed5d86..28968a9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka fUML Interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.interfaces
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.Semantics.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)";visibility:=reexport,
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml
index 510ce45..183dd23 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.eclipse.papyrus.moka</groupId>
   	<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-  	<version>3.0.0-SNAPSHOT</version>
+  	<version>4.0.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
index e7cbb4d..9a8e299 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.fuml.statemachines.interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.statemachines.interfaces
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+Require-Bundle: org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.CommonBehavior,
  org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.StateMachines,
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/pom.xml
index e93008c..0c41b94 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/pom.xml
@@ -5,12 +5,11 @@
   <parent>
   	<groupId>org.eclipse.papyrus.moka</groupId>
   	<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-  	<version>3.0.0-SNAPSHOT</version>
+  	<version>4.0.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
   <artifactId>org.eclipse.papyrus.moka.fuml.statemachines.interfaces</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>org.eclipse.papyrus.moka.fuml.statemachines.interfaces</name>
   <description>Interfaces for PSSM execution engine</description>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
index c8e56d9..0f4a729 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.fuml.statemachines
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.statemachines;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.statemachines.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0"
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/pom.xml
index d8f7c1c..548ed23 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/pom.xml
@@ -6,12 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.fuml.statemachines</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fuml.statemachines</name>
 	<description>Execution engine implementing PSSM (Precise Semantics for UML State Machines)</description>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index 0203c38..ec3f5a3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Require-Bundle: org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.service;bundle-version="4.0.0",
  org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka.fuml;
   uses:="org.eclipse.papyrus.moka.engine,
@@ -143,7 +143,7 @@
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Eclipse-BuddyPolicy: registered
 Bundle-Name: Moka fUML Execution Engine
 Bundle-ManifestVersion: 2
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml
index 837e6fb..9cce432 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF
index ab53783..311a8e5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Timed fUML Interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.timedfuml.interfaces
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
+Require-Bundle: org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka.timedfuml.interfaces.semantics.CommonBehaviors
 Automatic-Module-Name: org.eclipse.papyrus.moka.timedfuml.interfaces
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/pom.xml
index 5f787c4..325676a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/pom.xml
@@ -5,13 +5,12 @@
   <parent>
   		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
   <artifactId>org.eclipse.papyrus.moka.timedfuml.interfaces</artifactId>
   <packaging>eclipse-plugin</packaging>
   <name>org.eclipse.papyrus.moka.timedfuml.interfaces</name>
-  <version>1.0.0-SNAPSHOT</version>
   
 </project>
\ No newline at end of file
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
index 27a6f8f..15133de 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Timed fUML
 Bundle-SymbolicName: org.eclipse.papyrus.moka.timedfuml;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.timedfuml.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="4.0.0",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/pom.xml
index 1c4e973..f54d0c4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
index 1418ee9..6d1a0be 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka,
  org.eclipse.papyrus.moka.engine
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka Execution Engine Core
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.Activator
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka/pom.xml
index d27293e..6db0d8d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/pom.xml
@@ -7,13 +7,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka</name>
 	<description>Moka core definition of execution engine framework</description>
 	
diff --git a/bundles/core/engines/pom.xml b/bundles/core/engines/pom.xml
index 4c9fad1..c898ebc 100644
--- a/bundles/core/engines/pom.xml
+++ b/bundles/core/engines/pom.xml
@@ -9,14 +9,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.core.engines</artifactId>
 	<packaging>pom</packaging>
 	<name>Moka Engines (Engines folder)</name>
-	<version>3.0.0-SNAPSHOT</version>
 	
 	<!-- Modules to build -->
 	<modules>
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
index 7f1e3be..06d3415 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka.fuml.assertionlibrary,
  org.eclipse.papyrus.moka.fuml.assertionlibrary.basic,
  org.eclipse.papyrus.moka.fuml.assertionlibrary.reporting,
  org.eclipse.papyrus.moka.fuml.assertionlibrary.utils
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka Assertion Library
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.assertionlibrary.Activator
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
index 216a842..c176f0b 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.libraries</artifactId>
-		<version>2.0.200-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
@@ -15,6 +15,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fuml.assertionlibrary</name>
 	<description>Model library for assertions specification</description>
-	<version>2.0.100-SNAPSHOT</version>
 	
 </project>
\ No newline at end of file
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index 782f38e..63ec423 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@
  org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
  org.eclipse.ui.console;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka.fuml.standardlibrary,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.boolean_,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.integer,
@@ -16,7 +16,7 @@
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.unlimitednatural
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka fUML Standard Library
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.standardlibrary.Activator
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
index 762d04e..2d7400e 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.libraries</artifactId>
-		<version>2.0.200-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/core/libraries/pom.xml b/bundles/core/libraries/pom.xml
index 2f22bb1..c72e820 100644
--- a/bundles/core/libraries/pom.xml
+++ b/bundles/core/libraries/pom.xml
@@ -9,13 +9,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.core.libraries</artifactId>
 	<packaging>pom</packaging>
-	<version>2.0.200-SNAPSHOT</version>
 	<name>Moka Libraries (Libraries folder)</name>
 	
 	<!-- Modules to build -->
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index c7998e7..231d144 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
index c181c02..ec887a7 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Animation Service
 Bundle-SymbolicName: org.eclipse.papyrus.moka.animation;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.animation.AnimationPlugin
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.2.1,3.0.0)",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0"
+ org.eclipse.papyrus.moka.service;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils.ui;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.animation,
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/pom.xml b/bundles/core/services/org.eclipse.papyrus.moka.animation/pom.xml
index 1277dec..1e84f36 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/pom.xml
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.services</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
index 00aab2e..f9455f2 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Debug Service
 Bundle-SymbolicName: org.eclipse.papyrus.moka.debug;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.debug.MokaDebugPlugin
-Require-Bundle: org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.animation;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100",
+Require-Bundle: org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.animation;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils.ui;bundle-version="4.0.0",
  org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.moka.debug;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.debug;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0"
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/pom.xml b/bundles/core/services/org.eclipse.papyrus.moka.debug/pom.xml
index 6bf084c..9b5fa3b 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/pom.xml
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.services</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
index 7efa82e..2bb60fb 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Service Core
 Bundle-SymbolicName: org.eclipse.papyrus.moka.service;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.service.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.service
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/pom.xml b/bundles/core/services/org.eclipse.papyrus.moka.service/pom.xml
index 81c0fe0..d608c48 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/pom.xml
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.services</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/core/services/pom.xml b/bundles/core/services/pom.xml
index 7be1f47..bb74318 100644
--- a/bundles/core/services/pom.xml
+++ b/bundles/core/services/pom.xml
@@ -9,13 +9,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.core.services</artifactId>
 	<packaging>pom</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>Moka Services (Services folder)</name>
 	
 	<!-- Modules to build -->
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
index 139013a..eee0f8b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils.ui;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka.composites.utils,
  org.eclipse.papyrus.moka.composites.utils.handlers,
  org.eclipse.papyrus.moka.composites.utils.ui
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka Composite Utils
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.composites.utils.Activator
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/pom.xml
index e1096f2..38a8223 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/pom.xml
@@ -7,13 +7,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.composites.utils</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.composites.utils</name>
 	<description>Helper to make faster the specification of classes constructors</description>
 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
index a48b5bf..a054ee8 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Discrete Event Clock (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.moka.discreteevent;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.discreteevent.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/pom.xml
index 9bde113..7d6e9ee 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.discreteevent</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.discreteevent</name>
-	<version>3.0.0-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
index dbd8ecc..d05a49c 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka External Control Manager (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.moka.externalcontrol
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.externalcontrol.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0",
- org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="4.0.0",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/pom.xml
index febb977..fb1a6ff 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/pom.xml
@@ -6,14 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.externalcontrol</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.externalcontrol</name>
-	<version>2.1.0-SNAPSHOT</version>
 
 	<!-- Build specificities -->
 	<build>
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
index dcead64..9259639 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: MOKA custom fUML libraries annotation tools
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: CEA
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
  org.eclipse.pde.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.14.0,3.0.0)",
- org.eclipse.papyrus.moka.simex;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.simex;bundle-version="4.0.0",
  org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)"
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
index 95842eb..94a4258 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
@@ -6,12 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.fuml.libraries.tools.annotations</artifactId>
-	<version>1.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fuml.libraries.tools.annotations</name>
 	<description>Annotations and annotation processor for creating new fUML libraries</description>
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
index 3aef67a..f625251 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka Validation Rules for fUML/PSCS models
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.validation.Activator
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/pom.xml
index 93a8e45..8ab961a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/pom.xml
@@ -7,13 +7,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.fuml.validation</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.fuml.validation</name>
 	<description>Feature enabling fUML model validation</description>
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
index 7803d3a..759f2ac 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Modeling Utils
 Bundle-SymbolicName: org.eclipse.papyrus.moka.modeling.utils
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/pom.xml
index a827bf2..7ee8ec5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,6 +14,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.modeling.utils</name>
 	<description>Generic utils for modeling aspects</description>
-	<version>1.1.0-SNAPSHOT</version>
 	
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
index 7e07a56..1c2ad61 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SIMplified EXecutable UML
 Bundle-SymbolicName: org.eclipse.papyrus.moka.simex;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.simex.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml
index 903b340..12e215b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml
@@ -7,13 +7,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
 	<artifactId>org.eclipse.papyrus.moka.simex</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.simex</name>
 	
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
index 1241475..827778a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: InstanceSpecification Table plugin
 Bundle-SymbolicName: org.eclipse.papyrus.moka.ui.table.instancespecification;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.ui.table.instancespecification.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
index 2a0707b..b5719e6 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -15,6 +15,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.ui.table.instancespecification</name>
 	<description>InstanceSpecification Table plugin</description>
-	<version>2.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
index e9d06cb..08bfe93 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka UI Utils plugin
 Bundle-SymbolicName: org.eclipse.papyrus.moka.utils.ui
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka.utils.helper,
  org.eclipse.papyrus.moka.utils.helper.presentation
 Automatic-Module-Name: org.eclipse.papyrus.moka.utils.ui
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/pom.xml
index 439b3b0..75d24d2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.utils.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.utils.ui</name>
 	<description>Common set of ui specific helpers and constants shared between the different parts of Moka</description>
 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
index 13c6b9b..8232958 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Utils
 Bundle-SymbolicName: org.eclipse.papyrus.moka.utils
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.utils.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0"
+Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.utils,
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.utils/pom.xml
index 8acde06..5e8e49a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.utils</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.utils</name>
 	<description>Common set of helpers and constants shared between the different parts of Moka</description>
 
diff --git a/bundles/core/tools/pom.xml b/bundles/core/tools/pom.xml
index 014e421..10e53b9 100644
--- a/bundles/core/tools/pom.xml
+++ b/bundles/core/tools/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
index 6d4f9bd..3859383 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.datavisualization.ui;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.papyrus.moka.datavisualization;bundle-version="1.0.100",
- org.eclipse.papyrus.moka.xygraph.common;bundle-version="1.0.100",
+ org.eclipse.papyrus.moka.datavisualization;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.xygraph.common;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100",
- org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.1.0"
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.datavisualization.handlers,
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
index b6cd69c..14db452 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.datavisualization.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.datavisualization.ui</name>
-	<version>1.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
index e6054eb..536c3ae 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.datavisualization;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.Activator
 Bundle-Vendor: Eclipse ModelingFramework
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml
index e8f2617..d49c081 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.datavisualization</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.datavisualization</name>
-	<version>1.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
index e01cbe6..92d107f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.common;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.common.Activator
 Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.0.100",
+ org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="4.0.0",
  org.eclipse.draw2d;bundle-version="[3.10.100,4.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.nebula.visualization.xygraph;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100"
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.xygraph.common,
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml
index 84e58f0..6b8aa9b 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
index eac38e2..17c86e3 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.mapping
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.mapping.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.draw2d;bundle-version="[3.10.100,4.0.0)",
  org.eclipse.nebula.visualization.xygraph;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100"
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.xygraph.mapping,
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
index 01138b6..612afeb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
index b239ffb..63d08ef 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.model;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml
index 237c07c..c9eedab 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.xygraph.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.xygraph.model</name>
-	<version>1.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
index db3364a..d3bafe7 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.modelexplorer;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.modelexplorer.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100",
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)",
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
index e6bac30..a084276 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.xygraph.modelexplorer</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.xygraph.modelexplorer</name>
-	<version>1.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
index f31f26d..2568f1d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.properties;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.properties.Activator
-Require-Bundle: org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100",
+Require-Bundle: org.eclipse.papyrus.moka.xygraph.model;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.3.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
index 90943d6..2092aa1 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.xygraph.properties</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.xygraph.properties</name>
-	<version>1.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/core/tools/visualization/pom.xml b/bundles/core/tools/visualization/pom.xml
index d391504..430b432 100644
--- a/bundles/core/tools/visualization/pom.xml
+++ b/bundles/core/tools/visualization/pom.xml
@@ -9,12 +9,11 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.tools</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.core.tools.visualization</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Moka Data Visualization Tool</name>
 	
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF b/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
index fbe5869..2304e17 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.moka;bundle-version="2.0.100",
+Require-Bundle: org.eclipse.papyrus.moka;bundle-version="4.0.0",
  org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.2.1,3.0.0)",
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.debug;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.animation;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.debug;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils.ui;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.animation;bundle-version="4.0.0"
 Export-Package: org.eclipse.papyrus.moka.launch,
  org.eclipse.papyrus.moka.ui,
  org.eclipse.papyrus.moka.ui.breakpoint.decoration,
@@ -17,7 +17,7 @@
  org.eclipse.papyrus.moka.ui.preferences,
  org.eclipse.papyrus.moka.ui.views
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka UI
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.ui.Activator
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/pom.xml b/bundles/core/ui/org.eclipse.papyrus.moka.ui/pom.xml
index 686aff8..a4031da 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/pom.xml
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core.ui</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/core/ui/pom.xml b/bundles/core/ui/pom.xml
index ddcedc2..4547f8b 100644
--- a/bundles/core/ui/pom.xml
+++ b/bundles/core/ui/pom.xml
@@ -9,13 +9,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.core</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.core.ui</artifactId>
 	<packaging>pom</packaging>
-	<version>2.0.100-SNAPSHOT</version>
 	<name>Moka UI (UI folder)</name>
 	
 	<!-- Modules to build -->
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
index f3ef3d9..6fa77a3 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka FMI 2.0 Master implementation
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.master;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.master.Activator
 Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.14.0,4.0.0)",
  com.github.jnr.jffi;bundle-version="[1.2.15,1.3.0)",
  com.github.jnr.ffi;bundle-version="[2.1.4,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0"
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.fmi.master,
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
index 55829b9..9a173f4 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.fmi.master</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.1.0-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.fmi.master</name>
 	<description>Moka FMI 2.0 Master implementation</description>
 
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
index 503c215..2c82e57 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FMU slave debug engine
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.engine.debug;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmu.engine.debug.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.papyrus.moka.fmu.engine;bundle-version="3.0.0",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fmu.engine;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="4.0.0",
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0"
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
index 13fb299..d212038 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
index cd55701..7248b03 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FMU slave engine
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.engine;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmu.engine.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
  com.fasterxml.jackson.core.jackson-core;bundle-version="[2.5.0,3.0.0)",
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0"
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.fmu.communication,
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
index 9abeef9..8addd48 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
index dd50f0b..5778366 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka execution engine for cosimulation
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.cosimulation;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Require-Bundle: org.eclipse.papyrus.moka.fmi.master;bundle-version="2.1.0",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
+Bundle-Version: 4.0.0.qualifier
+Require-Bundle: org.eclipse.papyrus.moka.fmi.master;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="4.0.0",
  org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
index 0495c13..da4c9e5 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
@@ -6,13 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.fuml.cosimulation</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.1.0-SNAPSHOT</version>
 	<name>org.eclipse.papyrus.moka.fuml.cosimulation</name>
 	<description>Moka execution engine for FMI cosimulation</description>
 
diff --git a/bundles/fmi/engines/pom.xml b/bundles/fmi/engines/pom.xml
index 76a6ecd..640b5a9 100644
--- a/bundles/fmi/engines/pom.xml
+++ b/bundles/fmi/engines/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
index 6397f46..45f94af 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@
  org.eclipse.uml2.uml.resources;bundle-version="[5.4.0,6.0.0)",
  org.eclipse.uml2.uml.profile.standard;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.fmi;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Name: FMI 2.0 UML Profile
 Bundle-ManifestVersion: 2
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
index e05e65a..a3a4134 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.language</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/fmi/language/pom.xml b/bundles/fmi/language/pom.xml
index 982c270..dc88ef4 100644
--- a/bundles/fmi/language/pom.xml
+++ b/bundles/fmi/language/pom.xml
@@ -8,14 +8,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.fmi.language</artifactId>
 	<packaging>pom</packaging>
 	<name>FMI Language (Language folder)</name>
-	<version>2.0.100-SNAPSHOT</version>
 
 	<!-- Modules to build -->
 	<modules>
diff --git a/bundles/fmi/pom.xml b/bundles/fmi/pom.xml
index 555617f..69a516a 100644
--- a/bundles/fmi/pom.xml
+++ b/bundles/fmi/pom.xml
@@ -9,14 +9,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.fmi</artifactId>
 	<packaging>pom</packaging>
 	<name>Moka FMI (FMI folder)</name>
-	<version>3.0.0-SNAPSHOT</version>
 	
 	<!-- Modules to build -->
 	<modules>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
index af77ea5..fa71922 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FMI 2 UML Importer
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.fmi2uml
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.fmi.fmi2uml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
index abe8af0..8062009 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,6 +14,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fmi.fmi2uml</name>
 	<description>FMI 2 UML Importer</description>
-	<version>2.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
index 9741b7e..3abbe3d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FMI 2.0 UML profile UI integration
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.profile.ui;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.profile.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
index a0cbd3c..dc7ca7d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,6 +14,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fmi.profile.ui</name>
 	<description>Papyrus integration of FMI 2.0 profile</description>
-	<version>2.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
index 7a99e53..c62402b 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka RCP for FMI export
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.rcp.export
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.rcp.export
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
index 66847e3..26ecf46 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,13 +14,12 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fmi.rcp.export</name>
 	<description>Moka RCP for FMI export</description>
-	<version>1.0.0-SNAPSHOT</version>
 	
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.papyrus.moka</groupId>
 			<artifactId>org.eclipse.papyrus.moka.fmu.product</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>4.0.0-SNAPSHOT</version>
 			<type>eclipse-repository</type>
 		</dependency>
 	</dependencies>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
index cfbd06d..fb964ec 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
  org.eclipse.uml2.types;bundle-version="[2.4.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml
index e63d412..e049203 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,6 +14,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fmi</name>
 	<description>EMF-based FMI 2.0 model description XML parser/serializer</description>
-	<version>2.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
index 5cf5c21..23a3e0a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka standalone RCP for FMU
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.rcp;singleton:=true
-Bundle-Version: 2.0.100.qualifier
-Require-Bundle: org.eclipse.papyrus.moka.fmu.engine;bundle-version="3.0.0",
+Bundle-Version: 4.0.0.qualifier
+Require-Bundle: org.eclipse.papyrus.moka.fmu.engine;bundle-version="4.0.0",
  org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="4.0.0",
  org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.equinox.app;bundle-version="[1.3.500,2.0.0)",
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmi;bundle-version="4.0.0",
  org.eclipse.emf.common;bundle-version="[2.14.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)",
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
index 085f129..1d339c1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,6 +14,5 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.fmu.rcp</name>
 	<description>Moka standlone RCP for FMU simulation</description>
-	<version>2.0.100-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/bundles/fmi/tools/pom.xml b/bundles/fmi/tools/pom.xml
index b0d26dc..f96d8ec 100644
--- a/bundles/fmi/tools/pom.xml
+++ b/bundles/fmi/tools/pom.xml
@@ -9,13 +9,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
 	<packaging>pom</packaging>
-	<version>2.1.0-SNAPSHOT</version>
 	<name>FMI Tools (Tools folder)</name>
 	
 	<!-- Modules to build -->
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
index ca3bb64..c428012 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FMI UI
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.ui.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.9.1,2.0.0)",
- org.eclipse.papyrus.moka.ui;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.composites.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmu.engine;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.ui;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmu.engine;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="4.0.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.2.1,3.0.0)",
  org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.1.0,4.0.0)",
@@ -21,8 +21,8 @@
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile
+ org.eclipse.papyrus.moka.fmi;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
index 85f48f3..ede9b24 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.ui</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
diff --git a/bundles/fmi/ui/pom.xml b/bundles/fmi/ui/pom.xml
index ebd9bf3..0355b17 100644
--- a/bundles/fmi/ui/pom.xml
+++ b/bundles/fmi/ui/pom.xml
@@ -9,13 +9,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.bundles.fmi.ui</artifactId>
 	<packaging>pom</packaging>
-	<version>2.1.0-SNAPSHOT</version>
 	<name>FMI UI (UI folder)</name>
 	
 	<!-- Modules to build -->
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 91bfa38..4e948a7 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.root</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index 26200e4..96dbc22 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.moka.feature"
       label="Moka Core (Incubation)"
-      version="3.1.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description url="http://www.example.com/description">
@@ -32,19 +32,11 @@
       <import plugin="org.eclipse.debug.core" version="3.12.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
       <import plugin="org.eclipse.uml2.uml" version="5.4.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.utils" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.service" version="2.0.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.109.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.core" version="3.0.100" match="compatible"/>
       <import plugin="org.eclipse.ui.console" version="3.8.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.3.0" match="compatible"/>
       <import plugin="org.aspectj.runtime" version="1.9.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.composites" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.standardlibrary" version="2.0.100" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.lang" version="2.6.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.core.log" version="1.2.0" match="compatible"/>
       <import plugin="org.eclipse.jface" version="3.14.0" match="compatible"/>
@@ -52,13 +44,9 @@
       <import plugin="org.eclipse.papyrus.uml.diagram.common" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.editor" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="2.2.1" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.debug" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.utils.ui" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.animation" version="2.0.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.papyrus.uml.tools.utils" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.emf" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.4.0" match="compatible"/>
       <import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
@@ -74,18 +62,11 @@
       <import plugin="org.eclipse.equinox.registry" version="3.8.0" match="compatible"/>
       <import plugin="org.eclipse.emf.validation" version="1.8.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.services.labelprovider" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.timedfuml.interfaces" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.aspectj.runtime" version="1.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.10.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.discreteevent" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.papyrus.infra.ui" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common.ui" version="2.13.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.datavisualization" version="1.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.xygraph.common" version="1.0.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.papyrus.infra.properties" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.xygraph.model" version="1.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.xygraph.mapping" version="1.0.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.draw2d" version="3.10.100" match="compatible"/>
       <import plugin="org.eclipse.nebula.visualization.xygraph" version="3.1.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore" version="2.13.0" match="compatible"/>
@@ -95,12 +76,30 @@
       <import plugin="org.eclipse.papyrus.emf.facet.custom.ui" version="3.1.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.properties.ui" version="3.3.0" match="compatible"/>
       <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.papyrus.moka.timedfuml" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.papyrus.uml.nattable" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.uml.nattable.xtext.valuespecification" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils" version="1.3.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.services.validation" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.xygraph.mapping" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.utils" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.service" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.composites" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.standardlibrary" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.debug" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.utils.ui" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.animation" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.timedfuml.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.discreteevent" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.datavisualization" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.xygraph.common" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.xygraph.model" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.xygraph.mapping" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.timedfuml" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.papyrus.moka.feature/pom.xml b/features/org.eclipse.papyrus.moka.feature/pom.xml
index 7e56912..c6ae754 100644
--- a/features/org.eclipse.papyrus.moka.feature/pom.xml
+++ b/features/org.eclipse.papyrus.moka.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.features</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
index 693c069..1890047 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.moka.fmi.feature"
-      label="Moka For Cosimulation (Incubation)"
-      version="3.0.0.qualifier"
+      label="Moka for Cosimulation (Incubation)"
+      version="4.0.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description url="http://www.example.com/description">
@@ -23,20 +23,10 @@
       <import plugin="org.eclipse.uml2.types" version="2.4.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore.xmi" version="2.14.0" match="compatible"/>
       <import plugin="org.eclipse.uml2.uml" version="5.4.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.fmi.profile" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fmi" version="2.0.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.3.0" match="compatible"/>
       <import plugin="org.eclipse.jface" version="3.14.0" match="compatible"/>
       <import plugin="com.github.jnr.jffi" version="1.2.15" match="equivalent"/>
       <import plugin="com.github.jnr.ffi" version="2.1.4" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.composites" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fmi.master" version="2.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.timedfuml" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core" version="3.12.0" match="compatible"/>
       <import plugin="org.eclipse.uml2.uml.resources" version="5.4.0" match="compatible"/>
       <import plugin="org.eclipse.uml2.uml.profile.standard" version="1.4.0" match="compatible"/>
@@ -44,10 +34,6 @@
       <import plugin="org.eclipse.ui.ide" version="3.14.0" match="compatible"/>
       <import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
       <import plugin="org.eclipse.emf.transaction" version="1.9.1" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.ui" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.composites.utils" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fmu.engine" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fmi.fmi2uml" version="2.0.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="2.2.1" match="compatible"/>
       <import plugin="org.eclipse.papyrus.uml.diagram.composite" version="3.1.0" match="compatible"/>
@@ -58,16 +44,30 @@
       <import plugin="org.eclipse.papyrus.infra.core" version="3.0.100" match="compatible"/>
       <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.5.0" match="compatible"/>
       <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.moka.service" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.utils" version="2.0.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.discreteevent" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.moka.timedfuml.interfaces" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.cli" version="1.2.0" match="compatible"/>
       <import plugin="org.aspectj.runtime" version="1.9.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.app" version="1.3.500" match="compatible"/>
       <import plugin="org.eclipse.emf.common" version="2.14.0" match="compatible"/>
-      <import feature="org.eclipse.papyrus.moka.feature" version="3.1.0.qualifier"/>
+      <import feature="org.eclipse.papyrus.moka.feature" version="4.0.0.qualifier"/>
+      <import plugin="org.eclipse.papyrus.moka.fmi.profile" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fmi" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.composites" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fmi.master" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.timedfuml" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.ui" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.composites.utils" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fmu.engine" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fmi.fmi2uml" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.service" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.utils" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.discreteevent" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrus.moka.timedfuml.interfaces" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml b/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
index 29762aa..9f9d11c 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
@@ -5,14 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.features</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
 	<artifactId>org.eclipse.papyrus.moka.fmi.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<name>Moka FMI Feature</name>
-	<version>3.0.0-SNAPSHOT</version>
 	
 	<build>
 		<plugins>
diff --git a/features/pom.xml b/features/pom.xml
index e5e8e31..b508b20 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.root</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/pom.xml b/pom.xml
index 1449633..fde5596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<!-- Parent of this POM -->
 	<parent>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.releng.configuration</artifactId>
 		<relativePath>./releng/org.eclipse.papyrus.moka.configuration</relativePath>
@@ -20,7 +20,7 @@
 	<!-- Children modules to build -->
 	<modules>
 		<module>bundles</module>
-		<!-- <module>tests</module> -->
+		<module>tests</module>
 		<module>releng</module>
 		<module>products</module>
 		<module>features</module>
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF b/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
index 2697958..f18fa04 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
+++ b/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka RCP (FMU embedded)
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.product
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: Eclipse Modelling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.moka.fmu.product
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/pom.xml b/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
index 0a69e46..34f3a21 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
+++ b/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.products</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
@@ -14,7 +14,6 @@
 	<packaging>eclipse-repository</packaging>
 	<name>FMU embedded Moka (RCP)</name>
 	<description>FMU embedded Moka</description>
-	<version>2.0.0-SNAPSHOT</version>
 
 	<properties>
 		<fmi.exporter.target.folder>../../bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/resources/</fmi.exporter.target.folder>
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF b/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF
index f573d46..e88934f 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF
+++ b/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka CLI
 Bundle-SymbolicName: org.eclipse.papyrus.moka.standalone.product;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.standalone.product.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)"
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/pom.xml b/products/org.eclipse.papyrus.moka.standalone.product/pom.xml
index 49232a5..bb0c54d 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/pom.xml
+++ b/products/org.eclipse.papyrus.moka.standalone.product/pom.xml
@@ -6,14 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.products</artifactId>
-		<version>2.0.100-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.standalone.product</artifactId>
 	<name>Moka Standalone (CLI mode)</name>
 	<packaging>eclipse-repository</packaging>
-	<version>2.0.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/products/pom.xml b/products/pom.xml
index a8fc32d..c1a73d7 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -9,14 +9,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.root</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.products</artifactId>
 	<packaging>pom</packaging>
 	<name>Moka RCP (Bundles folder)</name>
-	<version>2.0.100-SNAPSHOT</version>
 	
 	<!-- Modules to build -->
 	<modules>
diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index 201e58a..2b0975d 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -14,7 +14,7 @@
 	<!-- Moka root POM: general information -->
 	<groupId>org.eclipse.papyrus.moka</groupId>
 	<artifactId>org.eclipse.papyrus.moka.releng.configuration</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Moka</name>
 	<description>Papyrus Model Execution Platform</description>
@@ -31,7 +31,7 @@
 		<component.package.rootname>org.eclipse.papyrus.moka</component.package.rootname>
 		<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/moka/</component.apibaseline.url>
 		<eclipse.targetrelease>photon</eclipse.targetrelease>
-		<target.version>3.1.0-SNAPSHOT</target.version>
+		<target.version>4.0.0-SNAPSHOT</target.version>
 	</properties>
 
 	<!-- Moka CI system-->
diff --git a/releng/org.eclipse.papyrus.moka.p2/category.xml b/releng/org.eclipse.papyrus.moka.p2/category.xml
index 1c02416..00853ad 100644
--- a/releng/org.eclipse.papyrus.moka.p2/category.xml
+++ b/releng/org.eclipse.papyrus.moka.p2/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.papyrus.moka.fmi.feature_3.0.0.qualifier.jar" id="org.eclipse.papyrus.moka.fmi.feature" version="3.0.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.moka.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.moka.feature" version="4.0.0.qualifier">
       <category name="org.eclipse.papyrus.moka"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.moka.feature_3.1.0.qualifier.jar" id="org.eclipse.papyrus.moka.feature" version="3.1.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.moka.fmi.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.moka.fmi.feature" version="4.0.0.qualifier">
       <category name="org.eclipse.papyrus.moka"/>
    </feature>
    <category-def name="org.eclipse.papyrus.moka" label="Moka">
diff --git a/releng/org.eclipse.papyrus.moka.p2/pom.xml b/releng/org.eclipse.papyrus.moka.p2/pom.xml
index a57e897..c48a0b3 100644
--- a/releng/org.eclipse.papyrus.moka.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.p2/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.releng</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF b/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF
index 9253192..f010281 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF
@@ -5,15 +5,17 @@
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.standalone.rcp.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime,
- org.apache.commons.cli;bundle-version="1.2.0",
- org.eclipse.emf.ecore,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
- org.eclipse.equinox.registry,
- org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
- org.eclipse.papyrus.moka,
- org.eclipse.debug.core;bundle-version="3.10.100"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.debug.core;bundle-version="[3.10.100,4.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.moka.standalone.rcp
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/pom.xml b/releng/org.eclipse.papyrus.moka.standalone.rcp/pom.xml
index 71831d2..b1f7f58 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/pom.xml
@@ -7,13 +7,12 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.releng</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
 	<artifactId>org.eclipse.papyrus.moka.standalone.rcp</artifactId>
 	<name>Moka Standalone RCP</name>
 	<packaging>eclipse-plugin</packaging>
-	<version>2.0.0-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
index 1bc75fa..c9b6352 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Photon Target Platform" sequenceNumber="1534867261">
+<target name="Moka Photon Target Platform" sequenceNumber="1534945949">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -9,27 +9,31 @@
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse" location="http://download.eclipse.org/releases/photon"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.aspectj.feature.group" version="1.9.0.201805281636"/>
-      <unit id="org.eclipse.ajdt.feature.group" version="2.2.4.201805281636"/>
-      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.2.0.201805281636"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.aspectj.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
       <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/48/dev/update/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/>
-      <unit id="com.github.jnr.constants" version="0.9.8.v20180207-1730"/>
-      <unit id="com.github.jnr.enxio" version="0.16.0.v20180207-1730"/>
-      <unit id="com.github.jnr.ffi" version="2.1.4.v20180207-1730"/>
-      <unit id="com.github.jnr.jffi" version="1.2.15.v20180207-1730"/>
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
+      <unit id="com.github.jnr.constants" version="0.0.0"/>
+      <unit id="com.github.jnr.enxio" version="0.0.0"/>
+      <unit id="com.github.jnr.ffi" version="0.0.0"/>
+      <unit id="com.github.jnr.jffi" version="0.0.0"/>
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.1.0.201804281520"/>
-      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="2.1.0.201804281520"/>
+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.0.0"/>
       <repository id="nebula" location="http://download.eclipse.org/nebula/releases/2.0.1"/>
     </location>
   </locations>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
index 7d12ebe..e1ee265 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
@@ -6,25 +6,29 @@
  org.eclipse.jdt.feature.group lazy
  org.eclipse.equinox.p2.discovery.feature.feature.group lazy
  org.eclipse.equinox.executable.feature.group lazy
- org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/" papyrus {
+	org.eclipse.papyrus.junit.feature.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
 }
 
 location "http://download.eclipse.org/tools/ajdt/48/dev/update/" aspectj{
-	org.aspectj.feature.group
-	org.eclipse.ajdt.feature.group
-	org.eclipse.equinox.weaving.sdk.feature.group
+	org.aspectj.feature.group lazy
+	org.eclipse.ajdt.feature.group lazy
+	org.eclipse.equinox.weaving.sdk.feature.group lazy
 }
 
 location "http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository" orbit{
-	com.fasterxml.jackson.core.jackson-annotations
-	com.fasterxml.jackson.core.jackson-core
-	com.github.jnr.constants
-	com.github.jnr.enxio
-	com.github.jnr.ffi
-	com.github.jnr.jffi
+	com.fasterxml.jackson.core.jackson-annotations lazy
+	com.fasterxml.jackson.core.jackson-core lazy
+	com.github.jnr.constants lazy
+	com.github.jnr.enxio lazy
+	com.github.jnr.ffi lazy
+	com.github.jnr.jffi lazy
 }
 
 location "http://download.eclipse.org/nebula/releases/2.0.1" nebula{
-	org.eclipse.nebula.widgets.xviewer.feature.feature.group
-	org.eclipse.nebula.visualization.feature.feature.group
+	org.eclipse.nebula.widgets.xviewer.feature.feature.group lazy
+	org.eclipse.nebula.visualization.feature.feature.group lazy
 }
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
index 58dadfd..fa5a51e 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.releng.platforms</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
diff --git a/releng/platforms/pom.xml b/releng/platforms/pom.xml
index 293275f..71c79a1 100644
--- a/releng/platforms/pom.xml
+++ b/releng/platforms/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.releng</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/releng/pom.xml b/releng/pom.xml
index 88cf4eb..8a6f517 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.root</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
index 6b73be3..71a7cfb 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test plugin
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.test
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.fmi;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="4.0.0"
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.test.Activator
 Export-Package: org.eclipse.papyrus.moka.fmi.test
 Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.test
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
index 493548d..2ece755 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.tests.fmi</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
diff --git a/tests/fmi/pom.xml b/tests/fmi/pom.xml
index f185a50..019e87b 100644
--- a/tests/fmi/pom.xml
+++ b/tests/fmi/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.tests</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/.classpath b/tests/org.eclipse.payrus.moka.tests.framework/.classpath
index cf36b56..cc5ee2d 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/.classpath
+++ b/tests/org.eclipse.payrus.moka.tests.framework/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src/">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/META-INF/MANIFEST.MF b/tests/org.eclipse.payrus.moka.tests.framework/META-INF/MANIFEST.MF
index 62d6ad9..3053f29 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.payrus.moka.tests.framework/META-INF/MANIFEST.MF
@@ -2,16 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Test Framework
 Bundle-SymbolicName: org.eclipse.papyrus.moka.tests.framework
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.payrus.moka.tests.framework.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.utils,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.moka,
- org.eclipse.papyrus.moka.utils
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.100,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.2.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.payrus.moka.tests.framework,
  org.eclipse.payrus.moka.tests.framework.semantics
+Automatic-Module-Name: org.eclipse.papyrus.moka.tests.framework
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/build.properties b/tests/org.eclipse.payrus.moka.tests.framework/build.properties
index ca51cea..94296b5 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/build.properties
+++ b/tests/org.eclipse.payrus.moka.tests.framework/build.properties
@@ -1,5 +1,7 @@
 source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               pom.xml
 src.includes = about.html
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/pom.xml b/tests/org.eclipse.payrus.moka.tests.framework/pom.xml
index e8c0c73..ae7a241 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/pom.xml
+++ b/tests/org.eclipse.payrus.moka.tests.framework/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.tests</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
diff --git a/tests/pom.xml b/tests/pom.xml
index 87064a5..4a8c4ff 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -8,14 +8,13 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.root</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
 	<artifactId>org.eclipse.papyrus.moka.tests</artifactId>
 	<packaging>pom</packaging>
 	<name>Moka Tests (Tests folder)</name>
-	<version>2.0.0-SNAPSHOT</version>
 
 	<!-- Modules to build -->
 	<modules>
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/.classpath b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/.classpath
index 43b9862..cc5ee2d 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/.classpath
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF
index 5d0af58..ab96abc 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF
@@ -1,41 +1,42 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.junit;bundle-version="4.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="2.0.0",
- org.eclipse.ui.navigator;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.emf.transaction;bundle-version="1.9.0",
- org.eclipse.papyrus.moka;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.debug.core;bundle-version="3.10.0",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.async.fuml;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.assertionlibrary;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.composites.utils;bundle-version="2.0.0",
- org.eclipse.papyrus.junit.utils;bundle-version="2.0.0",
- org.eclipse.equinox.ds;bundle-version="1.4.400",
- org.eclipse.equinox.event;bundle-version="1.3.200",
- org.eclipse.uml2.uml.resources;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.validation;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.ui;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.alf.libraries;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.tests.framework;bundle-version="2.0.0",
- org.aspectj.runtime;bundle-version="1.8.9"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.100,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.7.100,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.1,2.0.0)",
+ org.eclipse.papyrus.moka;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.papyrus.moka.composites;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.async.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.assertionlibrary;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.moka.composites.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.equinox.ds;bundle-version="[1.5.100,2.0.0)",
+ org.eclipse.equinox.event;bundle-version="[1.4.200,2.0.0)",
+ org.eclipse.uml2.uml.resources;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.fuml.validation;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.ui;bundle-version="4.0.0",
+ org.eclipse.papyrus.uml.alf.libraries;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
+ org.eclipse.papyrus.moka.tests.framework;bundle-version="4.0.0",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.moka.semantics.tests,
  org.eclipse.papyrus.moka.semantics.tests.composites
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: Moka Semantic Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.semantics.tests.MokaSemanticTestsActivator
 Bundle-SymbolicName: org.eclipse.papyrus.moka.semantics.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.semantics.tests
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/build.properties b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/build.properties
index 1fd8fd3..0c99e3c 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/build.properties
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/build.properties
@@ -1,6 +1,8 @@
 source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                resources/,\
-               about.html
+               about.html,\
+               pom.xml
 src.includes = about.html
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/pom.xml b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/pom.xml
index 065f4ae..f2255fd 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/pom.xml
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.tests.semantics</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
diff --git a/tests/semantics/pom.xml b/tests/semantics/pom.xml
index 071f7eb..585a7e9 100644
--- a/tests/semantics/pom.xml
+++ b/tests/semantics/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.tests</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->