diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/.project b/bundles/core/engines/org.eclipse.papyrus.moka.composites/.project
index d5b6825..bca0ea0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/.project
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/.project
@@ -5,12 +5,7 @@
 	<projects>
 	</projects>
 	<buildSpec>
-			<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	<buildCommand>
+		<buildCommand>
 			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
@@ -20,14 +15,12 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		
-
 		<buildCommand>
 			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-			<buildCommand>
+		<buildCommand>
 			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
 			<arguments>
 			</arguments>
@@ -44,6 +37,5 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		
 	</natures>
 </projectDescription>
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 2e1d13b..81c4ee4 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
@@ -11,7 +11,8 @@
  org.eclipse.papyrus.moka.composites.Semantics.impl.CompositeStructures.InvocationActions,
  org.eclipse.papyrus.moka.composites.Semantics.impl.CompositeStructures.StructuredClasses,
  org.eclipse.papyrus.moka.composites.Semantics.impl.Loci.LociL3,
- org.eclipse.papyrus.moka.composites.extensions.Semantics.CompositeStructures
+ org.eclipse.papyrus.moka.composites.extensions.Semantics.CompositeStructures,
+ org.eclipse.papyrus.moka.composites.extensions.Semantics.InvocationActions
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/.project b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/.project
index ca1875b..f23b859 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/.project
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/.project
@@ -6,11 +6,6 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-<buildCommand>
 			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
@@ -20,8 +15,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		
-		
 		<buildCommand>
 			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/.project b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/.project
index cc37b9e..68849e3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/.project
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/.project
@@ -6,11 +6,6 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project
index ca9021b..655f857 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project
@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
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 7eae7db..4021563 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
@@ -20,6 +20,7 @@
  org.eclipse.papyrus.moka.timedfuml.semantics.Actions.CompleteActions,
  org.eclipse.papyrus.moka.timedfuml.semantics.CommonBehaviors,
  org.eclipse.papyrus.moka.timedfuml.semantics.Loci,
+ org.eclipse.papyrus.moka.timedfuml.semantics.StateMachines,
  org.eclipse.papyrus.moka.timedfuml.semantics.StructuredClassifiers,
  org.eclipse.papyrus.moka.timedfuml.utils
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java
index 8d1ae8a..2bc0965 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java
@@ -22,7 +22,7 @@
 import org.eclipse.papyrus.moka.timedfuml.control.queue.TimedExecutionLoop;
 import org.eclipse.papyrus.moka.timedfuml.semantics.Loci.TimedExecutionFactory;
 import org.eclipse.papyrus.moka.timedfuml.semantics.Loci.TimedLocus;
-import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.Class;
 
 public class TimedUmlExecutionEngine extends StateMachineExecutionEngine {
 
@@ -59,7 +59,7 @@
 	@Override
 	protected void run_() {
 		// Starts the execution loop
-		RootExecution rootExecution = new RootExecution((Behavior) this.executionEntryPoint, this.executionArguments, locus);
+		RootExecution rootExecution = new RootExecution((Class)this.executionEntryPoint, this.executionArguments, locus);
 		ExecutionController.getInstance().setExecutionLoop(new TimedExecutionLoop());
 		ExecutionController.getInstance().start(rootExecution);
 	}
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project
index 6ac480e..1b5dad9 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project
@@ -6,11 +6,6 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>