diff --git a/features/org.etsi.mts.tdl.constraints.feature/feature.xml b/features/org.etsi.mts.tdl.constraints.feature/feature.xml
index a43e506b70a44c60774aa38f569633dae1c86609..afccba237ada49e6cbc1230b8e96550d829e6723 100644
--- a/features/org.etsi.mts.tdl.constraints.feature/feature.xml
+++ b/features/org.etsi.mts.tdl.constraints.feature/feature.xml
@@ -321,6 +321,7 @@ any resulting litigation.
       <import plugin="org.etsi.mts.tdl.model"/>
       <import plugin="org.eclipse.xtext"/>
       <import plugin="org.eclipse.epsilon.common.dt"/>
+      <import plugin="org.eclipse.ocl.xtext.completeocl"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
@@ -328,7 +329,8 @@ any resulting litigation.
       <import plugin="org.eclipse.ui.workbench"/>
       <import plugin="com.google.inject"/>
       <import plugin="org.eclipse.xtext.ui"/>
-      <import plugin="org.eclipse.ocl.xtext.completeocl"/>
+      <import plugin="org.eclipse.ocl.xtext.completeocl.ui"/>
+      <import plugin="org.eclipse.ocl.xtext.essentialocl.ui"/>
    </requires>
 
    <plugin
diff --git a/features/org.etsi.mts.tdl.model.feature/feature.xml b/features/org.etsi.mts.tdl.model.feature/feature.xml
index 58eeb7c1117a01fd5cd8ac1a5f9313dc90c0e9a5..9a83e6d1b87047b219e6ce01be76c9e5ec9e2b60 100644
--- a/features/org.etsi.mts.tdl.model.feature/feature.xml
+++ b/features/org.etsi.mts.tdl.model.feature/feature.xml
@@ -309,8 +309,8 @@ any resulting litigation.
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.ocl.pivot"/>
-      <import plugin="org.eclipse.ocl.xtext.essentialocl"/>
       <import plugin="org.eclipse.ocl.examples.codegen"/>
+      <import plugin="org.eclipse.ocl.xtext.essentialocl"/>
       <import plugin="org.eclipse.ocl.xtext.completeocl"/>
    </requires>
 
diff --git a/plugins/org.etsi.mts.tdl.TDLan2.feature/feature.xml b/plugins/org.etsi.mts.tdl.TDLan2.feature/feature.xml
index a5bc46d9a63fdccfbffaeebcd3c2169b54bc07e7..b13f4058fe68d12f59bd91e84467f133ee049b4e 100644
--- a/plugins/org.etsi.mts.tdl.TDLan2.feature/feature.xml
+++ b/plugins/org.etsi.mts.tdl.TDLan2.feature/feature.xml
@@ -308,8 +308,8 @@ any resulting litigation.
       <import plugin="org.eclipse.xtext"/>
       <import plugin="org.eclipse.xtext.xbase"/>
       <import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.14.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.util"/>
-      <import plugin="org.eclipse.xtend.lib"/>
       <import plugin="org.apache.log4j"/>
       <import plugin="org.eclipse.xtext.ide"/>
       <import plugin="org.eclipse.xtext.xbase.ide"/>
@@ -321,9 +321,8 @@ any resulting litigation.
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.xtext.builder"/>
-      <import feature="org.etsi.mts.tdl.model.feature" version="1.4.0.qualifier"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="org.antlr.runtime"/>
+      <import plugin="org.antlr.runtime"/> 
+      <import plugin="org.eclipse.xtend.lib" version="2.14.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/plugins/org.etsi.mts.tdl.TPLan2.feature/feature.xml b/plugins/org.etsi.mts.tdl.TPLan2.feature/feature.xml
index d76c6f5a75c1ee5d28df24a2de0a8db077da956d..56732a88b91f2cd754b4c8ab1b96f2b15ed6fc44 100644
--- a/plugins/org.etsi.mts.tdl.TPLan2.feature/feature.xml
+++ b/plugins/org.etsi.mts.tdl.TPLan2.feature/feature.xml
@@ -321,7 +321,6 @@ any resulting litigation.
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.xtext.builder"/>
-      <import feature="org.etsi.mts.tdl.model.feature" version="1.4.0.qualifier"/>
       <import plugin="org.eclipse.xtext.xbase.lib" version="2.14.0" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime"/>
    </requires>