diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index 4d25a51..4a4284a 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="%featureName"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
@@ -35,7 +35,7 @@
       <import plugin="org.eclipse.papyrus.moka.kernel.debug" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.engine.uml.debug" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.kernel.scheduling" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.core.log" version="1.2.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.core.log" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.jface" version="3.20.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.kernel.animation" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.pssm.interfaces" version="4.0.0" match="compatible"/>
@@ -44,43 +44,43 @@
       <import plugin="org.eclipse.debug.ui" version="3.14.0" match="compatible"/>
       <import plugin="org.eclipse.ui.workbench" version="3.119.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.engine.uml.time.interfaces" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.core" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.emf" version="3.1.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.core" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.emf" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.osgi" version="3.15.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.services.labelprovider" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.services.labelprovider" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.engine.uml.time.scheduling" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.engine.uml" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.18.0" match="compatible"/>
       <import plugin="org.apache.commons.lang" version="2.6.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.engine.uml.animation" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.3.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.ui.console" version="3.9.0" match="compatible"/>
       <import plugin="org.eclipse.ui" version="3.117.0" match="compatible"/>
       <import plugin="org.eclipse.emf.validation" version="1.8.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.uml.diagram.wizards" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.uml.diagram.wizards" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.paho.client.mqttv3" version="1.2.0" match="compatible"/>
       <import plugin="org.eclipse.e4.ui.css.core" version="0.12.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="2.4.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.utils.ui" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.architecture.representation" version="2.1.0"/>
       <import plugin="org.eclipse.json" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.papyrus.uml.tools.utils" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.uml.tools.utils" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.9.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.editor" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.editor" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common.ui" version="2.18.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.uml.diagram.common" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.services.validation" version="3.1.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.uml.diagram.common" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.services.validation" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.ui.tracepoint.view" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.trace.interfaces" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.trace" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.tracepoint.service" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.ui" version="2.1.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.ui" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.swt" version="3.114.100" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.widgets" version="3.6.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.widgets" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.trace.model" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.services.decoration" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.gmfdiag.commands" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.infra.services.markerlistener" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.services.decoration" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.gmfdiag.commands" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.infra.services.markerlistener" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
       <import plugin="org.eclipse.ui.ide" version="3.17.0" match="compatible"/>
    </requires>
diff --git a/features/org.eclipse.papyrus.moka.feature/pom.xml b/features/org.eclipse.papyrus.moka.feature/pom.xml
index 5383d1f..c633019 100644
--- a/features/org.eclipse.papyrus.moka.feature/pom.xml
+++ b/features/org.eclipse.papyrus.moka.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.features</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM description -->
diff --git a/features/pom.xml b/features/pom.xml
index 719939c..e7de5e8 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>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
@@ -20,4 +20,4 @@
 		<module>org.eclipse.papyrus.moka.feature</module>
 	</modules>
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.animation/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml.animation/META-INF/MANIFEST.MF
index 197c5b4..9f1b838 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.animation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.animation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml.animation
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml.animation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.moka.engine.uml.animation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.animation/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.animation/pom.xml
index 3180db7..869f033 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.animation/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.animation/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml.debug/META-INF/MANIFEST.MF
index bde7a6c..b1ddbb1 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml.debug
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml.debug;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Automatic-Module-Name: org.eclipse.papyrus.moka.engine.uml.debug
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
@@ -16,11 +16,12 @@
  org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
  org.eclipse.papyrus.moka.pscs.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.engine.uml.time.interfaces;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.15.0,4.0.0)",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka.engine.uml.debug.data.presentation,
  org.eclipse.papyrus.moka.engine.uml.debug.data.values,
  org.eclipse.papyrus.moka.engine.uml.debug.data.variables,
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.debug/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.debug/pom.xml
index d30226f..9c5878f 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.debug/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.debug/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/META-INF/MANIFEST.MF
index e77d90e..b139f7d 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml.scheduling
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml.scheduling
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.moka.engine.uml.scheduling
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/pom.xml
index 70cc394..14eb23d 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.scheduling/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/META-INF/MANIFEST.MF
index 4120b29..69adf91 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml.time.interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml.time.interfaces
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.moka.pssm.interfaces;bundle-version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/pom.xml
index 6a6ba86..716f3be 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time.interfaces/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/META-INF/MANIFEST.MF
index 7b5369b..a0a0a76 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml.time.scheduling
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml.time.scheduling;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.engine.uml.time.scheduling.de.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.papyrus.moka.kernel.scheduling;bundle-version="[4.0.0,5.0.0)"
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/pom.xml
index 5bf435b..f1d2d22 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time.scheduling/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml.time/META-INF/MANIFEST.MF
index bfea0d6..0a619b0 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml.time
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml.time;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.engine.uml.time.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.15.0,4.0.0)",
  org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
@@ -19,8 +19,9 @@
  org.eclipse.papyrus.moka.kernel.scheduling;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.engine.uml.scheduling;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.kernel.debug;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.engine.uml.time;
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml.time/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml.time/pom.xml
index d8870af..308fb7b 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml.time/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml.time/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.engine.uml/META-INF/MANIFEST.MF
index a6ba4ad..5b6943f 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.engine.uml
 Bundle-SymbolicName: org.eclipse.papyrus.moka.engine.uml;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Automatic-Module-Name: org.eclipse.papyrus.moka.engine.uml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
@@ -19,8 +19,10 @@
  org.eclipse.papyrus.moka.kernel.debug;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.engine.uml.debug;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.kernel.scheduling;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jface;bundle-version="[3.20.0,4.0.0)"
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.osgi;bundle-version="[3.15.300,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka.engine.uml,
  org.eclipse.papyrus.moka.engine.uml.libraries
 Bundle-Activator: org.eclipse.papyrus.moka.engine.uml.Activator
diff --git a/plugins/org.eclipse.papyrus.moka.engine.uml/pom.xml b/plugins/org.eclipse.papyrus.moka.engine.uml/pom.xml
index 60b8b89..23c646c 100644
--- a/plugins/org.eclipse.papyrus.moka.engine.uml/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.engine.uml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
index a49d2e6..2618843 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
@@ -1,16 +1,19 @@
 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)",
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
  org.eclipse.papyrus.moka.fuml;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.moka.engine.uml;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.moka.engine.uml;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.uml.alf;bundle-version="[3.0.0,5.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: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: org.eclipse.papyrus.moka.fuml.assertionlibrary
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.assertionlibrary.Activator
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
index 655fed3..25702fc 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
index ee2f2bc..0f954ca 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.fuml.interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.interfaces
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml b/plugins/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml
index e1ba452..35d253c 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml.interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.eclipse.papyrus.moka</groupId>
   	<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-  	<version>4.0.0-SNAPSHOT</version>
+  	<version>4.1.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index b247def..5b8e8ba 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -1,12 +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;bundle-version="[3.1.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.ui.console;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.fuml;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.moka.engine.uml;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.moka.engine.uml;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.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,
@@ -17,7 +20,7 @@
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.unlimitednatural
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: org.eclipse.papyrus.moka.fuml.standardlibrary
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.standardlibrary.Activator
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
index 69ceb7b..4555c91 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
index ca21abc..3005961 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: Moka Validation Rules for fUML models
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.validation.Activator
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.validation/pom.xml b/plugins/org.eclipse.papyrus.moka.fuml.validation/pom.xml
index 2ef87fc..17b8308 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.validation/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml.validation/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index 6ce505f..49f6212 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -12,11 +12,12 @@
  org.eclipse.papyrus.moka.engine.uml.debug;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.engine.uml.animation;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)"
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Eclipse-BuddyPolicy: registered
 Bundle-Name: org.eclipse.papyrus.moka.fuml
 Bundle-ManifestVersion: 2
diff --git a/plugins/org.eclipse.papyrus.moka.fuml/pom.xml b/plugins/org.eclipse.papyrus.moka.fuml/pom.xml
index cc3f7f2e..e67544f 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF
index 2b883b2..a751ff3 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.kernel.animation
 Bundle-SymbolicName: org.eclipse.papyrus.moka.kernel.animation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.animation.AnimationPlugin
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.15.0,4.0.0)",
  org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.4.0,4.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.utils.ui;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.pssm.interfaces;bundle-version="[4.0.0,5.0.0)",
@@ -14,7 +14,24 @@
  org.eclipse.papyrus.moka.pscs.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,5.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.tools;bundle-version="[3.2.0,5.0.0)",
+ org.w3c.css.sac;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.4.0,3.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.animation,
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.animation/pom.xml b/plugins/org.eclipse.papyrus.moka.kernel.animation/pom.xml
index 19dfa13..17f1ce7 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.animation/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.kernel.animation/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.kernel.debug/META-INF/MANIFEST.MF
index 77f790b..a894808 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.kernel.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.moka.kernel.debug;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.moka.debug.MokaDebugPlugin
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.15.0,4.0.0)",
@@ -10,8 +10,8 @@
  org.eclipse.papyrus.moka.utils;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.kernel.animation;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.utils.ui;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,4.0.0)",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.pscs.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.pssm.interfaces;bundle-version="[4.0.0,5.0.0)",
@@ -22,7 +22,12 @@
  org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)",
  org.eclipse.papyrus.moka.kernel.scheduling;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.debug/pom.xml b/plugins/org.eclipse.papyrus.moka.kernel.debug/pom.xml
index a1e9293..83a22e6 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.debug/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.kernel.debug/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.scheduling/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.kernel.scheduling/META-INF/MANIFEST.MF
index f8b4265..14fd1d2 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.scheduling/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.kernel.scheduling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.kernel.scheduling
 Bundle-SymbolicName: org.eclipse.papyrus.moka.kernel.scheduling
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.moka.engine.scheduling
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.scheduling/pom.xml b/plugins/org.eclipse.papyrus.moka.kernel.scheduling/pom.xml
index a37dc43..6c18e6e 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.scheduling/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.kernel.scheduling/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF
index 00e6d88..09fa56c 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
  org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.2.0,5.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.paho.client.mqttv3;bundle-version="[1.2.0,2.0.0)"
@@ -19,7 +19,7 @@
  org.eclipse.papyrus.moka.kernel.validation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: org.eclipse.papyrus.moka.kernel
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.kernel.MokaKernelActivator
diff --git a/plugins/org.eclipse.papyrus.moka.kernel/pom.xml b/plugins/org.eclipse.papyrus.moka.kernel/pom.xml
index fe7e7e3..5cddb34 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.kernel/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
index c0273e6..40d72c8 100644
--- a/plugins/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.modeling.utils
 Bundle-SymbolicName: org.eclipse.papyrus.moka.modeling.utils
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,5.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.papyrus.moka.modeling.utils
 Automatic-Module-Name: org.eclipse.papyrus.moka.modeling.utils
diff --git a/plugins/org.eclipse.papyrus.moka.modeling.utils/pom.xml b/plugins/org.eclipse.papyrus.moka.modeling.utils/pom.xml
index ea2e4ec..d448d6e 100644
--- a/plugins/org.eclipse.papyrus.moka.modeling.utils/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.modeling.utils/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pscs.interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pscs.interfaces/META-INF/MANIFEST.MF
index 73aab65..4cbf270 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs.interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pscs.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.pscs.interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.pscs.interfaces
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.pscs.Activator
 Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.pscs.interfaces/pom.xml b/plugins/org.eclipse.papyrus.moka.pscs.interfaces/pom.xml
index b31abff..ea57647 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs.interfaces/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pscs.interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.eclipse.papyrus.moka</groupId>
   	<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-  	<version>4.0.0-SNAPSHOT</version>
+  	<version>4.1.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pscs.utils/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pscs.utils/META-INF/MANIFEST.MF
index 9430e0e..2e53b80 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs.utils/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pscs.utils/META-INF/MANIFEST.MF
@@ -1,17 +1,18 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,5.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,4.0.0)",
  org.eclipse.papyrus.moka.pscs;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.moka.utils.ui;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.moka.utils.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Export-Package: org.eclipse.papyrus.moka.pscs.utils,
  org.eclipse.papyrus.moka.pscs.utils.handlers,
  org.eclipse.papyrus.moka.pscs.utils.ui
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: org.eclipse.papyrus.moka.pscs.utils
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.pscs.utils.Activator
diff --git a/plugins/org.eclipse.papyrus.moka.pscs.utils/pom.xml b/plugins/org.eclipse.papyrus.moka.pscs.utils/pom.xml
index f5ab3bc..7d33153 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs.utils/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pscs.utils/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pscs.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pscs.validation/META-INF/MANIFEST.MF
index 2e385a8..b80201d 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs.validation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pscs.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Validation Rules for PSCS models
 Bundle-SymbolicName: org.eclipse.papyrus.moka.pscs.validation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.pscs.validation.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui;bundle-version="[3.117.0,4.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.pscs.validation/pom.xml b/plugins/org.eclipse.papyrus.moka.pscs.validation/pom.xml
index 0418eb8..ac7395a 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs.validation/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pscs.validation/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pscs/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pscs/META-INF/MANIFEST.MF
index 8113e47..c2a715f 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pscs/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
  org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: org.eclipse.papyrus.moka.pscs
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.pscs.Activator
diff --git a/plugins/org.eclipse.papyrus.moka.pscs/pom.xml b/plugins/org.eclipse.papyrus.moka.pscs/pom.xml
index 34c63b6..7a6de96 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pscs/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pssm.interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pssm.interfaces/META-INF/MANIFEST.MF
index 4cc04a1..f5f5312 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm.interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pssm.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.pssm.interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.pssm.interfaces
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.moka.pscs.interfaces;bundle-version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.pssm.interfaces/pom.xml b/plugins/org.eclipse.papyrus.moka.pssm.interfaces/pom.xml
index 508f623..5075b77 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm.interfaces/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pssm.interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.eclipse.papyrus.moka</groupId>
   	<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-  	<version>4.0.0-SNAPSHOT</version>
+  	<version>4.1.0-SNAPSHOT</version>
   </parent>
   
   <!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pssm.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pssm.validation/META-INF/MANIFEST.MF
index 5d659b6..f7f7050 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm.validation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pssm.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Validation Rules for PSSM models
 Bundle-SymbolicName: org.eclipse.papyrus.moka.pssm.validation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.moka.pssm.validation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.papyrus.moka.pssm.validation/pom.xml b/plugins/org.eclipse.papyrus.moka.pssm.validation/pom.xml
index 14c3ef2..6507013 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm.validation/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pssm.validation/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF
index 5ea9183..f0880b4 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.pssm
 Bundle-SymbolicName: org.eclipse.papyrus.moka.pssm;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.pssm.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.15.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.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.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)",
  org.aspectj.runtime;bundle-version="[1.9.6,2.0.0)",
  org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.fuml;bundle-version="[4.0.0,5.0.0)",
@@ -15,7 +15,10 @@
  org.eclipse.papyrus.moka.pscs;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.pscs.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.pssm.interfaces;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/plugins/org.eclipse.papyrus.moka.pssm/pom.xml b/plugins/org.eclipse.papyrus.moka.pssm/pom.xml
index f59c620..30d406f 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pssm/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.trace.interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.trace.interfaces/META-INF/MANIFEST.MF
index 680aa11..3345ac1 100644
--- a/plugins/org.eclipse.papyrus.moka.trace.interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.trace.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Trace Service Interfaces
 Bundle-SymbolicName: org.eclipse.papyrus.moka.trace.interfaces;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.trace.interfaces.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.trace.interfaces/pom.xml b/plugins/org.eclipse.papyrus.moka.trace.interfaces/pom.xml
index 6c68c53..dbb2858 100644
--- a/plugins/org.eclipse.papyrus.moka.trace.interfaces/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.trace.interfaces/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.trace.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.trace.model/META-INF/MANIFEST.MF
index 934f1e8..3398791 100644
--- a/plugins/org.eclipse.papyrus.moka.trace.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.trace.model/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: Moka Trace Service Model
 Bundle-SymbolicName: org.eclipse.papyrus.moka.trace.model;singleton:=true
 Automatic-Module-Name: org.eclipse.papyrus.moka.trace.model
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -12,5 +12,7 @@
  org.eclipse.papyrus.moka.trace.model.mokatraceservice.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)"
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.uml2.uml.resources;bundle-version="[5.5.0,6.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.papyrus.moka.trace.model/pom.xml b/plugins/org.eclipse.papyrus.moka.trace.model/pom.xml
index 207b836..e023133 100644
--- a/plugins/org.eclipse.papyrus.moka.trace.model/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.trace.model/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.trace/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.trace/META-INF/MANIFEST.MF
index bdafd4a..b633f42 100644
--- a/plugins/org.eclipse.papyrus.moka.trace/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.trace/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Trace Service
 Bundle-SymbolicName: org.eclipse.papyrus.moka.trace;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.trace.Activator
 Require-Bundle: org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.15.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.trace.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.trace.model;bundle-version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.trace/pom.xml b/plugins/org.eclipse.papyrus.moka.trace/pom.xml
index fedd081..a3b9366 100644
--- a/plugins/org.eclipse.papyrus.moka.trace/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.trace/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.tracepoint.service/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.tracepoint.service/META-INF/MANIFEST.MF
index 1dc9021..b79eead 100644
--- a/plugins/org.eclipse.papyrus.moka.tracepoint.service/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.tracepoint.service/META-INF/MANIFEST.MF
@@ -2,19 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Tracepoint Service
 Bundle-SymbolicName: org.eclipse.papyrus.moka.tracepoint.service;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.tracepoint.service.Activator
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.15.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.tracepoint.service;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.moka.kernel.debug;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.moka.kernel.debug;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.moka.tracepoint.service
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.papyrus.moka.tracepoint.service/pom.xml b/plugins/org.eclipse.papyrus.moka.tracepoint.service/pom.xml
index 116f63a..fea9488 100644
--- a/plugins/org.eclipse.papyrus.moka.tracepoint.service/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.tracepoint.service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/META-INF/MANIFEST.MF
index 9771ab4..73fa515 100644
--- a/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Moka Tracepoint View
 Bundle-SymbolicName: org.eclipse.papyrus.moka.ui.tracepoint.view;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.ui.tracepoint.view.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.moka.ui.tracepoint.view
@@ -13,10 +13,12 @@
  org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)",
  org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.tracepoint.service;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.moka.tracepoint.service;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.moka.ui.tracepoint.view,
  org.eclipse.papyrus.moka.ui.tracepoint.view.internal.utils;x-internal:=true
diff --git a/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/pom.xml b/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/pom.xml
index 69ab247..fde634c 100644
--- a/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.ui.tracepoint.view/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
index 54a583e..19a135a 100644
--- a/plugins/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
@@ -1,21 +1,43 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.services.validation;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,5.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.4.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,3.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.kernel.debug;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.utils.ui;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.kernel.animation;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
  org.eclipse.papyrus.moka.ui.tracepoint.view;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.trace.interfaces;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.trace;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.tracepoint.service;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,0.13.0)"
+ org.eclipse.e4.ui.css.core;bundle-version="[0.12.1200,1.14.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.900,4.0.0)",
+ org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.9.200,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.3.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.moka.launch,
  org.eclipse.papyrus.moka.ui,
  org.eclipse.papyrus.moka.ui.breakpoint.decoration,
@@ -25,7 +47,7 @@
  org.eclipse.papyrus.moka.ui.preferences,
  org.eclipse.papyrus.moka.ui.views
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Name: org.eclipse.papyrus.moka.ui
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.ui.MokaUIActivator
diff --git a/plugins/org.eclipse.papyrus.moka.ui/pom.xml b/plugins/org.eclipse.papyrus.moka.ui/pom.xml
index d4d226b..d1d309a 100644
--- a/plugins/org.eclipse.papyrus.moka.ui/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.ui/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
index 94fc89e..f82bdc6 100644
--- a/plugins/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.utils.ui
 Bundle-SymbolicName: org.eclipse.papyrus.moka.utils.ui
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.swt;bundle-version="[3.114.100,4.0.0)"
+ org.eclipse.swt;bundle-version="[3.114.100,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,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/plugins/org.eclipse.papyrus.moka.utils.ui/pom.xml b/plugins/org.eclipse.papyrus.moka.utils.ui/pom.xml
index 07bbc11..1020953 100644
--- a/plugins/org.eclipse.papyrus.moka.utils.ui/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.utils.ui/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
index fb55768..8a32d7f 100644
--- a/plugins/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.papyrus.moka.utils
 Bundle-SymbolicName: org.eclipse.papyrus.moka.utils
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.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="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.utils/pom.xml b/plugins/org.eclipse.papyrus.moka.utils/pom.xml
index 9ea09f0..2956c32 100644
--- a/plugins/org.eclipse.papyrus.moka.utils/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.utils/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.plugins</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0a4220e..db5b2e1 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.root</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/pom.xml b/pom.xml
index 8259711..16c3ec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<!-- Parent of this POM -->
 	<parent>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.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>
diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index 3f21706..57cccdc 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.eclipse.papyrus.moka</groupId>
 	<artifactId>org.eclipse.papyrus.moka.releng.configuration</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>org.eclipse.papyrus.moka</name>
 	<description>Papyrus Model Execution Platform</description>
diff --git a/releng/org.eclipse.papyrus.moka.p2/pom.xml b/releng/org.eclipse.papyrus.moka.p2/pom.xml
index c48a0b3..f882728 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>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
@@ -15,4 +15,4 @@
 	<name>Moka update site</name>
 	<packaging>eclipse-repository</packaging>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
index 80f3869..dad2fc1 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Moka Target Platform" sequenceNumber="1599152889">
+<target name="Moka Target Platform" sequenceNumber="1604930062">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,7 +10,7 @@
       <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.json" version="0.0.0"/>
-      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-06"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
index a4733f6..415a796 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
@@ -1,6 +1,6 @@
 target "Moka Target Platform" with source requirements
 
-location "http://download.eclipse.org/releases/2020-06" eclipse {
+location "http://download.eclipse.org/releases/2020-12" eclipse {
 	org.eclipse.platform.feature.group lazy
  	org.eclipse.rcp.feature.group lazy
  	org.eclipse.jdt.feature.group lazy
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/pom.xml b/releng/org.eclipse.papyrus.moka.targetplatform/pom.xml
index 7c1e477..1fbf0e2 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.moka</groupId>
 		<artifactId>org.eclipse.papyrus.moka.releng</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/releng/pom.xml b/releng/pom.xml
index d991159..86129c6 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>4.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM description -->
@@ -21,4 +21,4 @@
 		<module>org.eclipse.papyrus.moka.targetplatform</module>
 	</modules>
 	
-</project>
\ No newline at end of file
+</project>