re-generated all Xtext languages, introduced TransitionBase

as common super class of Transition and RefinedTransition

Change-Id: Id4dc739696814d3ffc704626a37d6e9599f3432c

86 files changed, 3576 insertions, 3734 deletions

diff --git a/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore b/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore
index 654a0ab64..6451d9b38 100644
--- a/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore
+++ b/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore
@@ -78,7 +78,7 @@
         <details key="body" value="return (this instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.SimpleState%>)? ((SimpleState)this).getName() :(this instanceof &lt;%org.eclipse.etrice.core.fsm.fSM.RefinedState%>)? (((RefinedState)this).getTarget()==null? &quot;&quot;:((RefinedState)this).getTarget().getName()) :&quot;&quot;;"/>
       </eAnnotations>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
         containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
@@ -180,38 +180,40 @@
         <details key="documentation" value="&lt;br>By this name the choice point is referred to in the model.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
         containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Transition" eSuperTypes="#//StateGraphItem">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="&lt;br>The super class of&#xD;&#xA;&lt;ul>&#xD;&#xA;  &lt;li>{@link InitialTransition}&lt;/li>&#xD;&#xA;  &lt;li>{@link NonInitialTransition}&lt;/li>&#xD;&#xA;&lt;/ul>&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+  <eClassifiers xsi:type="ecore:EClass" name="TransitionBase">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+        containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;br>This is an optional name of the transition.&#xD;&#xA;"/>
+        <details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="to" eType="#//TransitionTerminal"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="action" eType="#//DetailCode"
         containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;br>This is the target node of the transition.&#xD;&#xA;"/>
+        <details key="documentation" value="&lt;br>This is an optional code in the code generator's target language.&#xD;&#xA;It is execute when the transition fires.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
-        containment="true">
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Transition" eSuperTypes="#//StateGraphItem #//TransitionBase">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;br>The super class of&#xD;&#xA;&lt;ul>&#xD;&#xA;  &lt;li>{@link InitialTransition}&lt;/li>&#xD;&#xA;  &lt;li>{@link NonInitialTransition}&lt;/li>&#xD;&#xA;&lt;/ul>&#xD;&#xA;"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
+        <details key="documentation" value="&lt;br>This is an optional name of the transition.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="action" eType="#//DetailCode"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="to" eType="#//TransitionTerminal"
         containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;br>This is an optional code in the code generator's target language.&#xD;&#xA;It is execute when the transition fires.&#xD;&#xA;"/>
+        <details key="documentation" value="&lt;br>This is the target node of the transition.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
@@ -274,7 +276,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RefinedTransition">
+  <eClassifiers xsi:type="ecore:EClass" name="RefinedTransition" eSuperTypes="#//TransitionBase">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;br>The refined transition is only allowed in {@link StateGraph}s&#xD;&#xA;of derived {@link ActorClass}es. It targets a {@link Transition}&#xD;&#xA;of the base class state machine.&#xD;&#xA;"/>
     </eAnnotations>
@@ -283,18 +285,6 @@
         <details key="documentation" value="&lt;br>This is the referenced transition in the base class state machine.&#xD;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="action" eType="#//DetailCode"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;br>This is an optional code in the code generator's target language.&#xD;&#xA;It is execute when the transition fires.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TransitionTerminal">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel b/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel
index a1f8af89c..fa6ce6164 100644
--- a/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel
+++ b/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.fsm/src-gen" editDirectory="/org.eclipse.etrice.core.fsm.edit/src"
     editorDirectory="/org.eclipse.etrice.core.fsm.editor/src" modelPluginID="org.eclipse.etrice.core.fsm"
     forceOverwrite="true" modelName="FSM" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.fsm.edit"
-    editorPluginID="org.eclipse.etrice.core.fsm.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.fsm.edit"
+    editorPluginID="org.eclipse.etrice.core.fsm.editor" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base">
   <genPackages prefix="FSM" basePackage="org.eclipse.etrice.core.fsm" disposableProviderFactory="true"
       fileExtensions="fsm" ecorePackage="FSM.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="FSM.ecore#//ComponentCommunicationType">
@@ -64,11 +64,13 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FSM.ecore#//ChoicePoint/name"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//ChoicePoint/docu"/>
     </genClasses>
+    <genClasses ecoreClass="FSM.ecore#//TransitionBase">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//TransitionBase/docu"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//TransitionBase/action"/>
+    </genClasses>
     <genClasses ecoreClass="FSM.ecore#//Transition">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FSM.ecore#//Transition/name"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//Transition/to"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//Transition/docu"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//Transition/action"/>
     </genClasses>
     <genClasses ecoreClass="FSM.ecore#//NonInitialTransition">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//NonInitialTransition/from"/>
@@ -87,8 +89,6 @@
     </genClasses>
     <genClasses ecoreClass="FSM.ecore#//RefinedTransition">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FSM.ecore#//RefinedTransition/target"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//RefinedTransition/docu"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FSM.ecore#//RefinedTransition/action"/>
     </genClasses>
     <genClasses ecoreClass="FSM.ecore#//TransitionTerminal"/>
     <genClasses ecoreClass="FSM.ecore#//StateTerminal">
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/AbstractFSMRuntimeModule.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/AbstractFSMRuntimeModule.java
index 35382bad6..0c4317193 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/AbstractFSMRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/AbstractFSMRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core.fsm;
 import java.util.Properties;
 
 import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
 
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
@@ -14,8 +13,8 @@ import com.google.inject.name.Names;
 /**
  * Manual modifications go to {org.eclipse.etrice.core.fsm.FSMRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractFSMRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractFSMRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSM.xtextbin b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSM.xtextbin
index 0f044e760..039389ea8 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSM.xtextbin
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSM.xtextbin
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSMStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSMStandaloneSetupGenerated.java
index 4c409c4a9..66f227ad4 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSMStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/FSMStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -16,6 +16,7 @@ import com.google.inject.Injector;
 @SuppressWarnings("all")
 public class FSMStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.etrice.core.common.BaseStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/AbstractInterfaceItem.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/AbstractInterfaceItem.java
index 455b1d3a4..5ba94e7c6 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/AbstractInterfaceItem.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/AbstractInterfaceItem.java
@@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getAbstractInterfaceItem()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/CPBranchTransition.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/CPBranchTransition.java
index 303523887..3d9ea4f54 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/CPBranchTransition.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/CPBranchTransition.java
@@ -16,10 +16,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.CPBranchTransition#getCondition <em>Condition</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getCPBranchTransition()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicePoint.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicePoint.java
index 73ede15e9..fd83b6064 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicePoint.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicePoint.java
@@ -22,11 +22,11 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ChoicePoint#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ChoicePoint#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getChoicePoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicepointTerminal.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicepointTerminal.java
index c18be42d7..08a28bb82 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicepointTerminal.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ChoicepointTerminal.java
@@ -16,10 +16,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ChoicepointTerminal#getCp <em>Cp</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getChoicepointTerminal()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ComponentCommunicationType.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ComponentCommunicationType.java
index 5d4c04b82..e1eda9269 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ComponentCommunicationType.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ComponentCommunicationType.java
@@ -146,6 +146,8 @@ public enum ComponentCommunicationType implements Enumerator
    * Returns the '<em><b>Component Communication Type</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static ComponentCommunicationType get(String literal)
@@ -165,6 +167,8 @@ public enum ComponentCommunicationType implements Enumerator
    * Returns the '<em><b>Component Communication Type</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static ComponentCommunicationType getByName(String name)
@@ -184,6 +188,8 @@ public enum ComponentCommunicationType implements Enumerator
    * Returns the '<em><b>Component Communication Type</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static ComponentCommunicationType get(int value)
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/DetailCode.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/DetailCode.java
index 41f6e8a77..a4bb8a6ba 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/DetailCode.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/DetailCode.java
@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.DetailCode#isUsed <em>Used</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.DetailCode#getLines <em>Lines</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getDetailCode()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java
index 9b8f3c805..961434149 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java
@@ -149,6 +149,15 @@ public interface FSMFactory extends EFactory
   ChoicePoint createChoicePoint();
 
   /**
+   * Returns a new object of class '<em>Transition Base</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Transition Base</em>'.
+   * @generated
+   */
+  TransitionBase createTransitionBase();
+
+  /**
    * Returns a new object of class '<em>Transition</em>'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMModel.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMModel.java
index 9f8400987..c7387627b 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMModel.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMModel.java
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.FSMModel#getComponents <em>Components</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getFSMModel()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java
index 13e184a5d..d615d91c3 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java
@@ -93,7 +93,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getIInterfaceItemOwner()
    * @generated
    */
-  int IINTERFACE_ITEM_OWNER = 36;
+  int IINTERFACE_ITEM_OWNER = 37;
 
   /**
    * The number of structural features of the '<em>IInterface Item Owner</em>' class.
@@ -676,6 +676,43 @@ public interface FSMPackage extends EPackage
   int CHOICE_POINT_FEATURE_COUNT = STATE_GRAPH_NODE_FEATURE_COUNT + 2;
 
   /**
+   * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionBaseImpl <em>Transition Base</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.etrice.core.fsm.fSM.impl.TransitionBaseImpl
+   * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransitionBase()
+   * @generated
+   */
+  int TRANSITION_BASE = 14;
+
+  /**
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TRANSITION_BASE__DOCU = 0;
+
+  /**
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TRANSITION_BASE__ACTION = 1;
+
+  /**
+   * The number of structural features of the '<em>Transition Base</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TRANSITION_BASE_FEATURE_COUNT = 2;
+
+  /**
    * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl <em>Transition</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -683,43 +720,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransition()
    * @generated
    */
-  int TRANSITION = 14;
+  int TRANSITION = 15;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION__NAME = STATE_GRAPH_ITEM_FEATURE_COUNT + 0;
+  int TRANSITION__DOCU = STATE_GRAPH_ITEM_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION__TO = STATE_GRAPH_ITEM_FEATURE_COUNT + 1;
+  int TRANSITION__ACTION = STATE_GRAPH_ITEM_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION__DOCU = STATE_GRAPH_ITEM_FEATURE_COUNT + 2;
+  int TRANSITION__NAME = STATE_GRAPH_ITEM_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION__ACTION = STATE_GRAPH_ITEM_FEATURE_COUNT + 3;
+  int TRANSITION__TO = STATE_GRAPH_ITEM_FEATURE_COUNT + 3;
 
   /**
    * The number of structural features of the '<em>Transition</em>' class.
@@ -738,43 +775,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getNonInitialTransition()
    * @generated
    */
-  int NON_INITIAL_TRANSITION = 15;
+  int NON_INITIAL_TRANSITION = 16;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int NON_INITIAL_TRANSITION__NAME = TRANSITION__NAME;
+  int NON_INITIAL_TRANSITION__DOCU = TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int NON_INITIAL_TRANSITION__TO = TRANSITION__TO;
+  int NON_INITIAL_TRANSITION__ACTION = TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int NON_INITIAL_TRANSITION__DOCU = TRANSITION__DOCU;
+  int NON_INITIAL_TRANSITION__NAME = TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int NON_INITIAL_TRANSITION__ACTION = TRANSITION__ACTION;
+  int NON_INITIAL_TRANSITION__TO = TRANSITION__TO;
 
   /**
    * The feature id for the '<em><b>From</b></em>' containment reference.
@@ -802,43 +839,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransitionChainStartTransition()
    * @generated
    */
-  int TRANSITION_CHAIN_START_TRANSITION = 16;
+  int TRANSITION_CHAIN_START_TRANSITION = 17;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION_CHAIN_START_TRANSITION__NAME = NON_INITIAL_TRANSITION__NAME;
+  int TRANSITION_CHAIN_START_TRANSITION__DOCU = NON_INITIAL_TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION_CHAIN_START_TRANSITION__TO = NON_INITIAL_TRANSITION__TO;
+  int TRANSITION_CHAIN_START_TRANSITION__ACTION = NON_INITIAL_TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION_CHAIN_START_TRANSITION__DOCU = NON_INITIAL_TRANSITION__DOCU;
+  int TRANSITION_CHAIN_START_TRANSITION__NAME = NON_INITIAL_TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRANSITION_CHAIN_START_TRANSITION__ACTION = NON_INITIAL_TRANSITION__ACTION;
+  int TRANSITION_CHAIN_START_TRANSITION__TO = NON_INITIAL_TRANSITION__TO;
 
   /**
    * The feature id for the '<em><b>From</b></em>' containment reference.
@@ -866,43 +903,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getInitialTransition()
    * @generated
    */
-  int INITIAL_TRANSITION = 17;
+  int INITIAL_TRANSITION = 18;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INITIAL_TRANSITION__NAME = TRANSITION__NAME;
+  int INITIAL_TRANSITION__DOCU = TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INITIAL_TRANSITION__TO = TRANSITION__TO;
+  int INITIAL_TRANSITION__ACTION = TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INITIAL_TRANSITION__DOCU = TRANSITION__DOCU;
+  int INITIAL_TRANSITION__NAME = TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INITIAL_TRANSITION__ACTION = TRANSITION__ACTION;
+  int INITIAL_TRANSITION__TO = TRANSITION__TO;
 
   /**
    * The number of structural features of the '<em>Initial Transition</em>' class.
@@ -921,43 +958,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getContinuationTransition()
    * @generated
    */
-  int CONTINUATION_TRANSITION = 18;
+  int CONTINUATION_TRANSITION = 19;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CONTINUATION_TRANSITION__NAME = NON_INITIAL_TRANSITION__NAME;
+  int CONTINUATION_TRANSITION__DOCU = NON_INITIAL_TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CONTINUATION_TRANSITION__TO = NON_INITIAL_TRANSITION__TO;
+  int CONTINUATION_TRANSITION__ACTION = NON_INITIAL_TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CONTINUATION_TRANSITION__DOCU = NON_INITIAL_TRANSITION__DOCU;
+  int CONTINUATION_TRANSITION__NAME = NON_INITIAL_TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CONTINUATION_TRANSITION__ACTION = NON_INITIAL_TRANSITION__ACTION;
+  int CONTINUATION_TRANSITION__TO = NON_INITIAL_TRANSITION__TO;
 
   /**
    * The feature id for the '<em><b>From</b></em>' containment reference.
@@ -985,43 +1022,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTriggeredTransition()
    * @generated
    */
-  int TRIGGERED_TRANSITION = 19;
+  int TRIGGERED_TRANSITION = 20;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRIGGERED_TRANSITION__NAME = TRANSITION_CHAIN_START_TRANSITION__NAME;
+  int TRIGGERED_TRANSITION__DOCU = TRANSITION_CHAIN_START_TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRIGGERED_TRANSITION__TO = TRANSITION_CHAIN_START_TRANSITION__TO;
+  int TRIGGERED_TRANSITION__ACTION = TRANSITION_CHAIN_START_TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRIGGERED_TRANSITION__DOCU = TRANSITION_CHAIN_START_TRANSITION__DOCU;
+  int TRIGGERED_TRANSITION__NAME = TRANSITION_CHAIN_START_TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int TRIGGERED_TRANSITION__ACTION = TRANSITION_CHAIN_START_TRANSITION__ACTION;
+  int TRIGGERED_TRANSITION__TO = TRANSITION_CHAIN_START_TRANSITION__TO;
 
   /**
    * The feature id for the '<em><b>From</b></em>' containment reference.
@@ -1058,43 +1095,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getGuardedTransition()
    * @generated
    */
-  int GUARDED_TRANSITION = 20;
+  int GUARDED_TRANSITION = 21;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int GUARDED_TRANSITION__NAME = TRANSITION_CHAIN_START_TRANSITION__NAME;
+  int GUARDED_TRANSITION__DOCU = TRANSITION_CHAIN_START_TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int GUARDED_TRANSITION__TO = TRANSITION_CHAIN_START_TRANSITION__TO;
+  int GUARDED_TRANSITION__ACTION = TRANSITION_CHAIN_START_TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int GUARDED_TRANSITION__DOCU = TRANSITION_CHAIN_START_TRANSITION__DOCU;
+  int GUARDED_TRANSITION__NAME = TRANSITION_CHAIN_START_TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int GUARDED_TRANSITION__ACTION = TRANSITION_CHAIN_START_TRANSITION__ACTION;
+  int GUARDED_TRANSITION__TO = TRANSITION_CHAIN_START_TRANSITION__TO;
 
   /**
    * The feature id for the '<em><b>From</b></em>' containment reference.
@@ -1131,43 +1168,43 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getCPBranchTransition()
    * @generated
    */
-  int CP_BRANCH_TRANSITION = 21;
+  int CP_BRANCH_TRANSITION = 22;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CP_BRANCH_TRANSITION__NAME = NON_INITIAL_TRANSITION__NAME;
+  int CP_BRANCH_TRANSITION__DOCU = NON_INITIAL_TRANSITION__DOCU;
 
   /**
-   * The feature id for the '<em><b>To</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CP_BRANCH_TRANSITION__TO = NON_INITIAL_TRANSITION__TO;
+  int CP_BRANCH_TRANSITION__ACTION = NON_INITIAL_TRANSITION__ACTION;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CP_BRANCH_TRANSITION__DOCU = NON_INITIAL_TRANSITION__DOCU;
+  int CP_BRANCH_TRANSITION__NAME = NON_INITIAL_TRANSITION__NAME;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>To</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CP_BRANCH_TRANSITION__ACTION = NON_INITIAL_TRANSITION__ACTION;
+  int CP_BRANCH_TRANSITION__TO = NON_INITIAL_TRANSITION__TO;
 
   /**
    * The feature id for the '<em><b>From</b></em>' containment reference.
@@ -1204,34 +1241,34 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getRefinedTransition()
    * @generated
    */
-  int REFINED_TRANSITION = 22;
+  int REFINED_TRANSITION = 23;
 
   /**
-   * The feature id for the '<em><b>Target</b></em>' reference.
+   * The feature id for the '<em><b>Docu</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int REFINED_TRANSITION__TARGET = 0;
+  int REFINED_TRANSITION__DOCU = TRANSITION_BASE__DOCU;
 
   /**
-   * The feature id for the '<em><b>Docu</b></em>' containment reference.
+   * The feature id for the '<em><b>Action</b></em>' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int REFINED_TRANSITION__DOCU = 1;
+  int REFINED_TRANSITION__ACTION = TRANSITION_BASE__ACTION;
 
   /**
-   * The feature id for the '<em><b>Action</b></em>' containment reference.
+   * The feature id for the '<em><b>Target</b></em>' reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int REFINED_TRANSITION__ACTION = 2;
+  int REFINED_TRANSITION__TARGET = TRANSITION_BASE_FEATURE_COUNT + 0;
 
   /**
    * The number of structural features of the '<em>Refined Transition</em>' class.
@@ -1240,7 +1277,7 @@ public interface FSMPackage extends EPackage
    * @generated
    * @ordered
    */
-  int REFINED_TRANSITION_FEATURE_COUNT = 3;
+  int REFINED_TRANSITION_FEATURE_COUNT = TRANSITION_BASE_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionTerminalImpl <em>Transition Terminal</em>}' class.
@@ -1250,7 +1287,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransitionTerminal()
    * @generated
    */
-  int TRANSITION_TERMINAL = 23;
+  int TRANSITION_TERMINAL = 24;
 
   /**
    * The number of structural features of the '<em>Transition Terminal</em>' class.
@@ -1269,7 +1306,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getStateTerminal()
    * @generated
    */
-  int STATE_TERMINAL = 24;
+  int STATE_TERMINAL = 25;
 
   /**
    * The feature id for the '<em><b>State</b></em>' reference.
@@ -1297,7 +1334,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTrPointTerminal()
    * @generated
    */
-  int TR_POINT_TERMINAL = 25;
+  int TR_POINT_TERMINAL = 26;
 
   /**
    * The feature id for the '<em><b>Tr Point</b></em>' reference.
@@ -1325,7 +1362,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getSubStateTrPointTerminal()
    * @generated
    */
-  int SUB_STATE_TR_POINT_TERMINAL = 26;
+  int SUB_STATE_TR_POINT_TERMINAL = 27;
 
   /**
    * The feature id for the '<em><b>Tr Point</b></em>' reference.
@@ -1362,7 +1399,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getChoicepointTerminal()
    * @generated
    */
-  int CHOICEPOINT_TERMINAL = 27;
+  int CHOICEPOINT_TERMINAL = 28;
 
   /**
    * The feature id for the '<em><b>Cp</b></em>' reference.
@@ -1390,7 +1427,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTrigger()
    * @generated
    */
-  int TRIGGER = 28;
+  int TRIGGER = 29;
 
   /**
    * The feature id for the '<em><b>Msg From If Pairs</b></em>' containment reference list.
@@ -1427,7 +1464,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getMessageFromIf()
    * @generated
    */
-  int MESSAGE_FROM_IF = 29;
+  int MESSAGE_FROM_IF = 30;
 
   /**
    * The feature id for the '<em><b>Message</b></em>' reference.
@@ -1464,7 +1501,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getAbstractInterfaceItem()
    * @generated
    */
-  int ABSTRACT_INTERFACE_ITEM = 30;
+  int ABSTRACT_INTERFACE_ITEM = 31;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1492,7 +1529,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getGuard()
    * @generated
    */
-  int GUARD = 31;
+  int GUARD = 32;
 
   /**
    * The feature id for the '<em><b>Guard</b></em>' containment reference.
@@ -1520,7 +1557,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getProtocolSemantics()
    * @generated
    */
-  int PROTOCOL_SEMANTICS = 32;
+  int PROTOCOL_SEMANTICS = 33;
 
   /**
    * The feature id for the '<em><b>Rules</b></em>' containment reference list.
@@ -1548,7 +1585,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getSemanticsRule()
    * @generated
    */
-  int SEMANTICS_RULE = 33;
+  int SEMANTICS_RULE = 34;
 
   /**
    * The feature id for the '<em><b>Msg</b></em>' reference.
@@ -1585,7 +1622,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getInSemanticsRule()
    * @generated
    */
-  int IN_SEMANTICS_RULE = 34;
+  int IN_SEMANTICS_RULE = 35;
 
   /**
    * The feature id for the '<em><b>Msg</b></em>' reference.
@@ -1622,7 +1659,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getOutSemanticsRule()
    * @generated
    */
-  int OUT_SEMANTICS_RULE = 35;
+  int OUT_SEMANTICS_RULE = 36;
 
   /**
    * The feature id for the '<em><b>Msg</b></em>' reference.
@@ -1659,7 +1696,7 @@ public interface FSMPackage extends EPackage
    * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getComponentCommunicationType()
    * @generated
    */
-  int COMPONENT_COMMUNICATION_TYPE = 37;
+  int COMPONENT_COMMUNICATION_TYPE = 38;
 
 
   /**
@@ -2067,58 +2104,68 @@ public interface FSMPackage extends EPackage
   EReference getChoicePoint_Docu();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.Transition <em>Transition</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase <em>Transition Base</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Transition</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.Transition
+   * @return the meta object for class '<em>Transition Base</em>'.
+   * @see org.eclipse.etrice.core.fsm.fSM.TransitionBase
    * @generated
    */
-  EClass getTransition();
+  EClass getTransitionBase();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getName <em>Name</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase#getDocu <em>Docu</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.Transition#getName()
-   * @see #getTransition()
+   * @return the meta object for the containment reference '<em>Docu</em>'.
+   * @see org.eclipse.etrice.core.fsm.fSM.TransitionBase#getDocu()
+   * @see #getTransitionBase()
    * @generated
    */
-  EAttribute getTransition_Name();
+  EReference getTransitionBase_Docu();
 
   /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getTo <em>To</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase#getAction <em>Action</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>To</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.Transition#getTo()
-   * @see #getTransition()
+   * @return the meta object for the containment reference '<em>Action</em>'.
+   * @see org.eclipse.etrice.core.fsm.fSM.TransitionBase#getAction()
+   * @see #getTransitionBase()
    * @generated
    */
-  EReference getTransition_To();
+  EReference getTransitionBase_Action();
 
   /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getDocu <em>Docu</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.Transition <em>Transition</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Docu</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.Transition#getDocu()
+   * @return the meta object for class '<em>Transition</em>'.
+   * @see org.eclipse.etrice.core.fsm.fSM.Transition
+   * @generated
+   */
+  EClass getTransition();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.etrice.core.fsm.fSM.Transition#getName()
    * @see #getTransition()
    * @generated
    */
-  EReference getTransition_Docu();
+  EAttribute getTransition_Name();
 
   /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getAction <em>Action</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getTo <em>To</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Action</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.Transition#getAction()
+   * @return the meta object for the containment reference '<em>To</em>'.
+   * @see org.eclipse.etrice.core.fsm.fSM.Transition#getTo()
    * @see #getTransition()
    * @generated
    */
-  EReference getTransition_Action();
+  EReference getTransition_To();
 
   /**
    * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.NonInitialTransition <em>Non Initial Transition</em>}'.
@@ -2256,28 +2303,6 @@ public interface FSMPackage extends EPackage
   EReference getRefinedTransition_Target();
 
   /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getDocu <em>Docu</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Docu</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getDocu()
-   * @see #getRefinedTransition()
-   * @generated
-   */
-  EReference getRefinedTransition_Docu();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getAction <em>Action</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Action</em>'.
-   * @see org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getAction()
-   * @see #getRefinedTransition()
-   * @generated
-   */
-  EReference getRefinedTransition_Action();
-
-  /**
    * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.TransitionTerminal <em>Transition Terminal</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -2937,46 +2962,56 @@ public interface FSMPackage extends EPackage
     EReference CHOICE_POINT__DOCU = eINSTANCE.getChoicePoint_Docu();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl <em>Transition</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionBaseImpl <em>Transition Base</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl
-     * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransition()
+     * @see org.eclipse.etrice.core.fsm.fSM.impl.TransitionBaseImpl
+     * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransitionBase()
      * @generated
      */
-    EClass TRANSITION = eINSTANCE.getTransition();
+    EClass TRANSITION_BASE = eINSTANCE.getTransitionBase();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Docu</b></em>' containment reference feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    EAttribute TRANSITION__NAME = eINSTANCE.getTransition_Name();
+    EReference TRANSITION_BASE__DOCU = eINSTANCE.getTransitionBase_Docu();
 
     /**
-     * The meta object literal for the '<em><b>To</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Action</b></em>' containment reference feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference TRANSITION__TO = eINSTANCE.getTransition_To();
+    EReference TRANSITION_BASE__ACTION = eINSTANCE.getTransitionBase_Action();
 
     /**
-     * The meta object literal for the '<em><b>Docu</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl <em>Transition</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl
+     * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getTransition()
      * @generated
      */
-    EReference TRANSITION__DOCU = eINSTANCE.getTransition_Docu();
+    EClass TRANSITION = eINSTANCE.getTransition();
 
     /**
-     * The meta object literal for the '<em><b>Action</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute TRANSITION__NAME = eINSTANCE.getTransition_Name();
+
+    /**
+     * The meta object literal for the '<em><b>To</b></em>' containment reference feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference TRANSITION__ACTION = eINSTANCE.getTransition_Action();
+    EReference TRANSITION__TO = eINSTANCE.getTransition_To();
 
     /**
      * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.NonInitialTransitionImpl <em>Non Initial Transition</em>}' class.
@@ -3099,22 +3134,6 @@ public interface FSMPackage extends EPackage
     EReference REFINED_TRANSITION__TARGET = eINSTANCE.getRefinedTransition_Target();
 
     /**
-     * The meta object literal for the '<em><b>Docu</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference REFINED_TRANSITION__DOCU = eINSTANCE.getRefinedTransition_Docu();
-
-    /**
-     * The meta object literal for the '<em><b>Action</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference REFINED_TRANSITION__ACTION = eINSTANCE.getRefinedTransition_Action();
-
-    /**
      * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionTerminalImpl <em>Transition Terminal</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Guard.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Guard.java
index da41e4088..45eb507ec 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Guard.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Guard.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Guard#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getGuard()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/GuardedTransition.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/GuardedTransition.java
index 4e903fc30..67dd4992b 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/GuardedTransition.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/GuardedTransition.java
@@ -18,10 +18,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.GuardedTransition#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getGuardedTransition()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/MessageFromIf.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/MessageFromIf.java
index c2dbf5082..4ab1d7b4f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/MessageFromIf.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/MessageFromIf.java
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.MessageFromIf#getMessage <em>Message</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.MessageFromIf#getFrom <em>From</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getMessageFromIf()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ModelComponent.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ModelComponent.java
index f91e0d8d5..b5b079d11 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ModelComponent.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ModelComponent.java
@@ -10,6 +10,7 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ModelComponent#isAbstract <em>Abstract</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ModelComponent#getCommType <em>Comm Type</em>}</li>
@@ -17,7 +18,6 @@ package org.eclipse.etrice.core.fsm.fSM;
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ModelComponent#getBase <em>Base</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ModelComponent#getStateMachine <em>State Machine</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getModelComponent()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/NonInitialTransition.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/NonInitialTransition.java
index 9d4bd7501..a278a6003 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/NonInitialTransition.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/NonInitialTransition.java
@@ -20,10 +20,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.NonInitialTransition#getFrom <em>From</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getNonInitialTransition()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ProtocolSemantics.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ProtocolSemantics.java
index fa49cc088..e533db809 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ProtocolSemantics.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/ProtocolSemantics.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics#getRules <em>Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getProtocolSemantics()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedState.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedState.java
index ddc2adde4..416d6ef17 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedState.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedState.java
@@ -18,10 +18,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.RefinedState#getTarget <em>Target</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getRefinedState()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedTransition.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedTransition.java
index 6cbde6acc..e38d69766 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedTransition.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/RefinedTransition.java
@@ -2,9 +2,6 @@
  */
 package org.eclipse.etrice.core.fsm.fSM;
 
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.etrice.core.common.base.Documentation;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,18 +17,16 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getDocu <em>Docu</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getAction <em>Action</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getRefinedTransition()
  * @model
  * @generated
  */
-public interface RefinedTransition extends EObject
+public interface RefinedTransition extends TransitionBase
 {
   /**
    * Returns the value of the '<em><b>Target</b></em>' reference.
@@ -59,57 +54,4 @@ public interface RefinedTransition extends EObject
    */
   void setTarget(Transition value);
 
-  /**
-   * Returns the value of the '<em><b>Docu</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * <!-- begin-model-doc -->
-   * <br>This is an optional documentation.
-   * 
-   * <!-- end-model-doc -->
-   * @return the value of the '<em>Docu</em>' containment reference.
-   * @see #setDocu(Documentation)
-   * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getRefinedTransition_Docu()
-   * @model containment="true"
-   * @generated
-   */
-  Documentation getDocu();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getDocu <em>Docu</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Docu</em>' containment reference.
-   * @see #getDocu()
-   * @generated
-   */
-  void setDocu(Documentation value);
-
-  /**
-   * Returns the value of the '<em><b>Action</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * <!-- begin-model-doc -->
-   * <br>This is an optional code in the code generator's target language.
-   * It is execute when the transition fires.
-   * 
-   * <!-- end-model-doc -->
-   * @return the value of the '<em>Action</em>' containment reference.
-   * @see #setAction(DetailCode)
-   * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getRefinedTransition_Action()
-   * @model containment="true"
-   * @generated
-   */
-  DetailCode getAction();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.RefinedTransition#getAction <em>Action</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Action</em>' containment reference.
-   * @see #getAction()
-   * @generated
-   */
-  void setAction(DetailCode value);
-
 } // RefinedTransition
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SemanticsRule.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SemanticsRule.java
index 96d70275b..1e2eb31a1 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SemanticsRule.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SemanticsRule.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.SemanticsRule#getMsg <em>Msg</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.SemanticsRule#getFollowUps <em>Follow Ups</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getSemanticsRule()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SimpleState.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SimpleState.java
index 0aad7f39b..367e13814 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SimpleState.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SimpleState.java
@@ -18,10 +18,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.SimpleState#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getSimpleState()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/State.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/State.java
index 436d4dbc9..9c509f69f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/State.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/State.java
@@ -20,6 +20,7 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.State#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.State#getEntryCode <em>Entry Code</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.State#getDoCode <em>Do Code</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.State#getSubgraph <em>Subgraph</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getState()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateGraph.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateGraph.java
index 3a5d2d944..80b94f48b 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateGraph.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateGraph.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getStates <em>States</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getTrPoints <em>Tr Points</em>}</li>
@@ -26,7 +27,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getTransitions <em>Transitions</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getRefinedTransitions <em>Refined Transitions</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getStateGraph()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateTerminal.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateTerminal.java
index 8a76bb3b0..07716e0ea 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateTerminal.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/StateTerminal.java
@@ -16,10 +16,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.StateTerminal#getState <em>State</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getStateTerminal()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SubStateTrPointTerminal.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SubStateTrPointTerminal.java
index e4efd3120..e72c1d0c2 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SubStateTrPointTerminal.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/SubStateTrPointTerminal.java
@@ -16,11 +16,11 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.SubStateTrPointTerminal#getTrPoint <em>Tr Point</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.SubStateTrPointTerminal#getState <em>State</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getSubStateTrPointTerminal()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPoint.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPoint.java
index d6cf44bb9..88a28bdd9 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPoint.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPoint.java
@@ -20,10 +20,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.TrPoint#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTrPoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPointTerminal.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPointTerminal.java
index 3fde5ac95..c008ed778 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPointTerminal.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TrPointTerminal.java
@@ -16,10 +16,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.TrPointTerminal#getTrPoint <em>Tr Point</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTrPointTerminal()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Transition.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Transition.java
index a6050c153..762d8c646 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Transition.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Transition.java
@@ -2,7 +2,6 @@
  */
 package org.eclipse.etrice.core.fsm.fSM;
 
-import org.eclipse.etrice.core.common.base.Documentation;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,19 +19,17 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Transition#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Transition#getTo <em>To</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Transition#getDocu <em>Docu</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Transition#getAction <em>Action</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransition()
  * @model
  * @generated
  */
-public interface Transition extends StateGraphItem
+public interface Transition extends StateGraphItem, TransitionBase
 {
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -86,57 +83,4 @@ public interface Transition extends StateGraphItem
    */
   void setTo(TransitionTerminal value);
 
-  /**
-   * Returns the value of the '<em><b>Docu</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * <!-- begin-model-doc -->
-   * <br>This is an optional documentation.
-   * 
-   * <!-- end-model-doc -->
-   * @return the value of the '<em>Docu</em>' containment reference.
-   * @see #setDocu(Documentation)
-   * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransition_Docu()
-   * @model containment="true"
-   * @generated
-   */
-  Documentation getDocu();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getDocu <em>Docu</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Docu</em>' containment reference.
-   * @see #getDocu()
-   * @generated
-   */
-  void setDocu(Documentation value);
-
-  /**
-   * Returns the value of the '<em><b>Action</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * <!-- begin-model-doc -->
-   * <br>This is an optional code in the code generator's target language.
-   * It is execute when the transition fires.
-   * 
-   * <!-- end-model-doc -->
-   * @return the value of the '<em>Action</em>' containment reference.
-   * @see #setAction(DetailCode)
-   * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransition_Action()
-   * @model containment="true"
-   * @generated
-   */
-  DetailCode getAction();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.Transition#getAction <em>Action</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Action</em>' containment reference.
-   * @see #getAction()
-   * @generated
-   */
-  void setAction(DetailCode value);
-
 } // Transition
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionBase.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionBase.java
new file mode 100644
index 000000000..3b19d4f10
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionBase.java
@@ -0,0 +1,81 @@
+/**
+ */
+package org.eclipse.etrice.core.fsm.fSM;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.etrice.core.common.base.Documentation;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Transition Base</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase#getDocu <em>Docu</em>}</li>
+ *   <li>{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase#getAction <em>Action</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransitionBase()
+ * @model
+ * @generated
+ */
+public interface TransitionBase extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Docu</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * <br>This is an optional documentation.
+   * 
+   * <!-- end-model-doc -->
+   * @return the value of the '<em>Docu</em>' containment reference.
+   * @see #setDocu(Documentation)
+   * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransitionBase_Docu()
+   * @model containment="true"
+   * @generated
+   */
+  Documentation getDocu();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase#getDocu <em>Docu</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Docu</em>' containment reference.
+   * @see #getDocu()
+   * @generated
+   */
+  void setDocu(Documentation value);
+
+  /**
+   * Returns the value of the '<em><b>Action</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * <br>This is an optional code in the code generator's target language.
+   * It is execute when the transition fires.
+   * 
+   * <!-- end-model-doc -->
+   * @return the value of the '<em>Action</em>' containment reference.
+   * @see #setAction(DetailCode)
+   * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransitionBase_Action()
+   * @model containment="true"
+   * @generated
+   */
+  DetailCode getAction();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase#getAction <em>Action</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Action</em>' containment reference.
+   * @see #getAction()
+   * @generated
+   */
+  void setAction(DetailCode value);
+
+} // TransitionBase
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionPoint.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionPoint.java
index 017b9a923..0cf42da06 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionPoint.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TransitionPoint.java
@@ -20,10 +20,10 @@ package org.eclipse.etrice.core.fsm.fSM;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.TransitionPoint#isHandler <em>Handler</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTransitionPoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Trigger.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Trigger.java
index 69e79f814..7ff340e42 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Trigger.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/Trigger.java
@@ -19,11 +19,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Trigger#getMsgFromIfPairs <em>Msg From If Pairs</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.Trigger#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTrigger()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TriggeredTransition.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TriggeredTransition.java
index 2a014d19c..f23d7a902 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TriggeredTransition.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/TriggeredTransition.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.TriggeredTransition#getTriggers <em>Triggers</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getTriggeredTransition()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/AbstractInterfaceItemImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/AbstractInterfaceItemImpl.java
index 0bb61939e..35afe57ea 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/AbstractInterfaceItemImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/AbstractInterfaceItemImpl.java
@@ -22,10 +22,10 @@ import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.AbstractInterfaceItemImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/CPBranchTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/CPBranchTransitionImpl.java
index 12fb16f5e..7ddd76136 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/CPBranchTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/CPBranchTransitionImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.CPBranchTransitionImpl#getCondition <em>Condition</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicePointImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicePointImpl.java
index c06afb663..d56fe3a73 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicePointImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicePointImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ChoicePointImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ChoicePointImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicepointTerminalImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicepointTerminalImpl.java
index d94bcaffb..af4017d78 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicepointTerminalImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ChoicepointTerminalImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ChoicepointTerminalImpl#getCp <em>Cp</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ContinuationTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ContinuationTransitionImpl.java
index 8f268f93b..9224b3645 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ContinuationTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ContinuationTransitionImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Continuation Transition</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/DetailCodeImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/DetailCodeImpl.java
index 6d8c471f3..513439946 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/DetailCodeImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/DetailCodeImpl.java
@@ -24,11 +24,11 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.DetailCodeImpl#isUsed <em>Used</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.DetailCodeImpl#getLines <em>Lines</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/EntryPointImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/EntryPointImpl.java
index d5de75db4..89bc52f09 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/EntryPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/EntryPointImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Entry Point</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ExitPointImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ExitPointImpl.java
index 16fd8c480..6fcf104dd 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ExitPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ExitPointImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Exit Point</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMFactoryImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMFactoryImpl.java
index 3f362409e..59a3e51bb 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMFactoryImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMFactoryImpl.java
@@ -79,6 +79,7 @@ public class FSMFactoryImpl extends EFactoryImpl implements FSMFactory
       case FSMPackage.ENTRY_POINT: return createEntryPoint();
       case FSMPackage.EXIT_POINT: return createExitPoint();
       case FSMPackage.CHOICE_POINT: return createChoicePoint();
+      case FSMPackage.TRANSITION_BASE: return createTransitionBase();
       case FSMPackage.TRANSITION: return createTransition();
       case FSMPackage.NON_INITIAL_TRANSITION: return createNonInitialTransition();
       case FSMPackage.TRANSITION_CHAIN_START_TRANSITION: return createTransitionChainStartTransition();
@@ -299,6 +300,17 @@ public class FSMFactoryImpl extends EFactoryImpl implements FSMFactory
    * <!-- end-user-doc -->
    * @generated
    */
+  public TransitionBase createTransitionBase()
+  {
+    TransitionBaseImpl transitionBase = new TransitionBaseImpl();
+    return transitionBase;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public Transition createTransition()
   {
     TransitionImpl transition = new TransitionImpl();
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMModelImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMModelImpl.java
index 19e213b7a..8f837d9b0 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMModelImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMModelImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.FSMModelImpl#getComponents <em>Components</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMPackageImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMPackageImpl.java
index 62d9d5d66..1cc2f617b 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMPackageImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/FSMPackageImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.etrice.core.fsm.fSM.SubStateTrPointTerminal;
 import org.eclipse.etrice.core.fsm.fSM.TrPoint;
 import org.eclipse.etrice.core.fsm.fSM.TrPointTerminal;
 import org.eclipse.etrice.core.fsm.fSM.Transition;
+import org.eclipse.etrice.core.fsm.fSM.TransitionBase;
 import org.eclipse.etrice.core.fsm.fSM.TransitionChainStartTransition;
 import org.eclipse.etrice.core.fsm.fSM.TransitionPoint;
 import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
@@ -164,6 +165,13 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
+  private EClass transitionBaseEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   private EClass transitionEClass = null;
 
   /**
@@ -778,9 +786,9 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EClass getTransition()
+  public EClass getTransitionBase()
   {
-    return transitionEClass;
+    return transitionBaseEClass;
   }
 
   /**
@@ -788,9 +796,9 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EAttribute getTransition_Name()
+  public EReference getTransitionBase_Docu()
   {
-    return (EAttribute)transitionEClass.getEStructuralFeatures().get(0);
+    return (EReference)transitionBaseEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -798,9 +806,19 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getTransition_To()
+  public EReference getTransitionBase_Action()
   {
-    return (EReference)transitionEClass.getEStructuralFeatures().get(1);
+    return (EReference)transitionBaseEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getTransition()
+  {
+    return transitionEClass;
   }
 
   /**
@@ -808,9 +826,9 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getTransition_Docu()
+  public EAttribute getTransition_Name()
   {
-    return (EReference)transitionEClass.getEStructuralFeatures().get(2);
+    return (EAttribute)transitionEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -818,9 +836,9 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getTransition_Action()
+  public EReference getTransition_To()
   {
-    return (EReference)transitionEClass.getEStructuralFeatures().get(3);
+    return (EReference)transitionEClass.getEStructuralFeatures().get(1);
   }
 
   /**
@@ -958,26 +976,6 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getRefinedTransition_Docu()
-  {
-    return (EReference)refinedTransitionEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getRefinedTransition_Action()
-  {
-    return (EReference)refinedTransitionEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   public EClass getTransitionTerminal()
   {
     return transitionTerminalEClass;
@@ -1345,11 +1343,13 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
     createEAttribute(choicePointEClass, CHOICE_POINT__NAME);
     createEReference(choicePointEClass, CHOICE_POINT__DOCU);
 
+    transitionBaseEClass = createEClass(TRANSITION_BASE);
+    createEReference(transitionBaseEClass, TRANSITION_BASE__DOCU);
+    createEReference(transitionBaseEClass, TRANSITION_BASE__ACTION);
+
     transitionEClass = createEClass(TRANSITION);
     createEAttribute(transitionEClass, TRANSITION__NAME);
     createEReference(transitionEClass, TRANSITION__TO);
-    createEReference(transitionEClass, TRANSITION__DOCU);
-    createEReference(transitionEClass, TRANSITION__ACTION);
 
     nonInitialTransitionEClass = createEClass(NON_INITIAL_TRANSITION);
     createEReference(nonInitialTransitionEClass, NON_INITIAL_TRANSITION__FROM);
@@ -1371,8 +1371,6 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
 
     refinedTransitionEClass = createEClass(REFINED_TRANSITION);
     createEReference(refinedTransitionEClass, REFINED_TRANSITION__TARGET);
-    createEReference(refinedTransitionEClass, REFINED_TRANSITION__DOCU);
-    createEReference(refinedTransitionEClass, REFINED_TRANSITION__ACTION);
 
     transitionTerminalEClass = createEClass(TRANSITION_TERMINAL);
 
@@ -1463,6 +1461,7 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
     exitPointEClass.getESuperTypes().add(this.getTrPoint());
     choicePointEClass.getESuperTypes().add(this.getStateGraphNode());
     transitionEClass.getESuperTypes().add(this.getStateGraphItem());
+    transitionEClass.getESuperTypes().add(this.getTransitionBase());
     nonInitialTransitionEClass.getESuperTypes().add(this.getTransition());
     transitionChainStartTransitionEClass.getESuperTypes().add(this.getNonInitialTransition());
     initialTransitionEClass.getESuperTypes().add(this.getTransition());
@@ -1470,6 +1469,7 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
     triggeredTransitionEClass.getESuperTypes().add(this.getTransitionChainStartTransition());
     guardedTransitionEClass.getESuperTypes().add(this.getTransitionChainStartTransition());
     cpBranchTransitionEClass.getESuperTypes().add(this.getNonInitialTransition());
+    refinedTransitionEClass.getESuperTypes().add(this.getTransitionBase());
     stateTerminalEClass.getESuperTypes().add(this.getTransitionTerminal());
     trPointTerminalEClass.getESuperTypes().add(this.getTransitionTerminal());
     subStateTrPointTerminalEClass.getESuperTypes().add(this.getTransitionTerminal());
@@ -1534,11 +1534,13 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
     initEAttribute(getChoicePoint_Name(), ecorePackage.getEString(), "name", null, 0, 1, ChoicePoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getChoicePoint_Docu(), theBasePackage.getDocumentation(), null, "docu", null, 0, 1, ChoicePoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    initEClass(transitionBaseEClass, TransitionBase.class, "TransitionBase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTransitionBase_Docu(), theBasePackage.getDocumentation(), null, "docu", null, 0, 1, TransitionBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTransitionBase_Action(), this.getDetailCode(), null, "action", null, 0, 1, TransitionBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
     initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getTransition_Name(), ecorePackage.getEString(), "name", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getTransition_To(), this.getTransitionTerminal(), null, "to", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransition_Docu(), theBasePackage.getDocumentation(), null, "docu", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransition_Action(), this.getDetailCode(), null, "action", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nonInitialTransitionEClass, NonInitialTransition.class, "NonInitialTransition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getNonInitialTransition_From(), this.getTransitionTerminal(), null, "from", null, 0, 1, NonInitialTransition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1560,8 +1562,6 @@ public class FSMPackageImpl extends EPackageImpl implements FSMPackage
 
     initEClass(refinedTransitionEClass, RefinedTransition.class, "RefinedTransition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getRefinedTransition_Target(), this.getTransition(), null, "target", null, 0, 1, RefinedTransition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRefinedTransition_Docu(), theBasePackage.getDocumentation(), null, "docu", null, 0, 1, RefinedTransition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRefinedTransition_Action(), this.getDetailCode(), null, "action", null, 0, 1, RefinedTransition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(transitionTerminalEClass, TransitionTerminal.class, "TransitionTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardImpl.java
index cda8dd1b7..ecffb4e33 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardImpl.java
@@ -21,10 +21,10 @@ import org.eclipse.etrice.core.fsm.fSM.Guard;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.GuardImpl#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardedTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardedTransitionImpl.java
index da9deba7e..c1d5c4658 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardedTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/GuardedTransitionImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.etrice.core.fsm.fSM.GuardedTransition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.GuardedTransitionImpl#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InSemanticsRuleImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InSemanticsRuleImpl.java
index 53d9da49f..9116dd436 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InSemanticsRuleImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InSemanticsRuleImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.InSemanticsRule;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>In Semantics Rule</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InitialTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InitialTransitionImpl.java
index e42fec07f..c7cac90eb 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InitialTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/InitialTransitionImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.InitialTransition;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Initial Transition</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/MessageFromIfImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/MessageFromIfImpl.java
index 40d423b6b..42ed17a8b 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/MessageFromIfImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/MessageFromIfImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.fsm.fSM.MessageFromIf;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.MessageFromIfImpl#getMessage <em>Message</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.MessageFromIfImpl#getFrom <em>From</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java
index d49309442..57ce480c1 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java
@@ -25,6 +25,7 @@ import org.eclipse.etrice.core.fsm.fSM.StateGraph;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ModelComponentImpl#isAbstract <em>Abstract</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ModelComponentImpl#getCommType <em>Comm Type</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.etrice.core.fsm.fSM.StateGraph;
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ModelComponentImpl#getBase <em>Base</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ModelComponentImpl#getStateMachine <em>State Machine</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/NonInitialTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/NonInitialTransitionImpl.java
index de3a5ec4f..61e7148da 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/NonInitialTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/NonInitialTransitionImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.NonInitialTransitionImpl#getFrom <em>From</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/OutSemanticsRuleImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/OutSemanticsRuleImpl.java
index 16442c479..246ea2c2a 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/OutSemanticsRuleImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/OutSemanticsRuleImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.OutSemanticsRule;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Out Semantics Rule</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java
index d5158e287..2c459604c 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.fsm.fSM.SemanticsRule;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.ProtocolSemanticsImpl#getRules <em>Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedStateImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedStateImpl.java
index 04c797aaf..21a697d7f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedStateImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedStateImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.fsm.fSM.State;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.RefinedStateImpl#getTarget <em>Target</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedTransitionImpl.java
index e9340ed89..d736262c3 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/RefinedTransitionImpl.java
@@ -3,17 +3,12 @@
 package org.eclipse.etrice.core.fsm.fSM.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.etrice.core.common.base.Documentation;
-
-import org.eclipse.etrice.core.fsm.fSM.DetailCode;
 import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
 import org.eclipse.etrice.core.fsm.fSM.RefinedTransition;
 import org.eclipse.etrice.core.fsm.fSM.Transition;
@@ -24,16 +19,14 @@ import org.eclipse.etrice.core.fsm.fSM.Transition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.RefinedTransitionImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.RefinedTransitionImpl#getDocu <em>Docu</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.RefinedTransitionImpl#getAction <em>Action</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implements RefinedTransition
+public class RefinedTransitionImpl extends TransitionBaseImpl implements RefinedTransition
 {
   /**
    * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
@@ -46,26 +39,6 @@ public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implemen
   protected Transition target;
 
   /**
-   * The cached value of the '{@link #getDocu() <em>Docu</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDocu()
-   * @generated
-   * @ordered
-   */
-  protected Documentation docu;
-
-  /**
-   * The cached value of the '{@link #getAction() <em>Action</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAction()
-   * @generated
-   * @ordered
-   */
-  protected DetailCode action;
-
-  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -134,120 +107,6 @@ public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implemen
    * <!-- end-user-doc -->
    * @generated
    */
-  public Documentation getDocu()
-  {
-    return docu;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetDocu(Documentation newDocu, NotificationChain msgs)
-  {
-    Documentation oldDocu = docu;
-    docu = newDocu;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.REFINED_TRANSITION__DOCU, oldDocu, newDocu);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDocu(Documentation newDocu)
-  {
-    if (newDocu != docu)
-    {
-      NotificationChain msgs = null;
-      if (docu != null)
-        msgs = ((InternalEObject)docu).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.REFINED_TRANSITION__DOCU, null, msgs);
-      if (newDocu != null)
-        msgs = ((InternalEObject)newDocu).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.REFINED_TRANSITION__DOCU, null, msgs);
-      msgs = basicSetDocu(newDocu, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.REFINED_TRANSITION__DOCU, newDocu, newDocu));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DetailCode getAction()
-  {
-    return action;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetAction(DetailCode newAction, NotificationChain msgs)
-  {
-    DetailCode oldAction = action;
-    action = newAction;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.REFINED_TRANSITION__ACTION, oldAction, newAction);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAction(DetailCode newAction)
-  {
-    if (newAction != action)
-    {
-      NotificationChain msgs = null;
-      if (action != null)
-        msgs = ((InternalEObject)action).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.REFINED_TRANSITION__ACTION, null, msgs);
-      if (newAction != null)
-        msgs = ((InternalEObject)newAction).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.REFINED_TRANSITION__ACTION, null, msgs);
-      msgs = basicSetAction(newAction, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.REFINED_TRANSITION__ACTION, newAction, newAction));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FSMPackage.REFINED_TRANSITION__DOCU:
-        return basicSetDocu(null, msgs);
-      case FSMPackage.REFINED_TRANSITION__ACTION:
-        return basicSetAction(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
@@ -256,10 +115,6 @@ public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implemen
       case FSMPackage.REFINED_TRANSITION__TARGET:
         if (resolve) return getTarget();
         return basicGetTarget();
-      case FSMPackage.REFINED_TRANSITION__DOCU:
-        return getDocu();
-      case FSMPackage.REFINED_TRANSITION__ACTION:
-        return getAction();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -277,12 +132,6 @@ public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implemen
       case FSMPackage.REFINED_TRANSITION__TARGET:
         setTarget((Transition)newValue);
         return;
-      case FSMPackage.REFINED_TRANSITION__DOCU:
-        setDocu((Documentation)newValue);
-        return;
-      case FSMPackage.REFINED_TRANSITION__ACTION:
-        setAction((DetailCode)newValue);
-        return;
     }
     super.eSet(featureID, newValue);
   }
@@ -300,12 +149,6 @@ public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implemen
       case FSMPackage.REFINED_TRANSITION__TARGET:
         setTarget((Transition)null);
         return;
-      case FSMPackage.REFINED_TRANSITION__DOCU:
-        setDocu((Documentation)null);
-        return;
-      case FSMPackage.REFINED_TRANSITION__ACTION:
-        setAction((DetailCode)null);
-        return;
     }
     super.eUnset(featureID);
   }
@@ -322,10 +165,6 @@ public class RefinedTransitionImpl extends MinimalEObjectImpl.Container implemen
     {
       case FSMPackage.REFINED_TRANSITION__TARGET:
         return target != null;
-      case FSMPackage.REFINED_TRANSITION__DOCU:
-        return docu != null;
-      case FSMPackage.REFINED_TRANSITION__ACTION:
-        return action != null;
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SemanticsRuleImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SemanticsRuleImpl.java
index 09d306f39..8357bd44e 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SemanticsRuleImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SemanticsRuleImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.etrice.core.fsm.fSM.SemanticsRule;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.SemanticsRuleImpl#getMsg <em>Msg</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.SemanticsRuleImpl#getFollowUps <em>Follow Ups</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SimpleStateImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SimpleStateImpl.java
index fd2f19dd9..6d65dced4 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SimpleStateImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SimpleStateImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.fsm.fSM.SimpleState;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.SimpleStateImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphImpl.java
index 4be78a0ad..516c53cf0 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.etrice.core.fsm.fSM.Transition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl#getStates <em>States</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl#getTrPoints <em>Tr Points</em>}</li>
@@ -37,7 +38,6 @@ import org.eclipse.etrice.core.fsm.fSM.Transition;
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl#getTransitions <em>Transitions</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl#getRefinedTransitions <em>Refined Transitions</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphItemImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphItemImpl.java
index 58a0ceb0d..6d1b58b3d 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphItemImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphItemImpl.java
@@ -17,8 +17,6 @@ import org.eclipse.etrice.core.fsm.fSM.Transition;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>State Graph Item</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphNodeImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphNodeImpl.java
index 90f8e9f92..0180c165a 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphNodeImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateGraphNodeImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.StateGraphNode;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>State Graph Node</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateImpl.java
index 37d111b7e..5da2eccf5 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateImpl.java
@@ -25,6 +25,7 @@ import org.eclipse.etrice.core.fsm.fSM.StateGraph;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl#getEntryCode <em>Entry Code</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.etrice.core.fsm.fSM.StateGraph;
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl#getDoCode <em>Do Code</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl#getSubgraph <em>Subgraph</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateTerminalImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateTerminalImpl.java
index 79cbb775f..aa514974c 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateTerminalImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/StateTerminalImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.fsm.fSM.StateTerminal;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.StateTerminalImpl#getState <em>State</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SubStateTrPointTerminalImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SubStateTrPointTerminalImpl.java
index 953e7be5e..059b1e511 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SubStateTrPointTerminalImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/SubStateTrPointTerminalImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.etrice.core.fsm.fSM.TrPoint;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.SubStateTrPointTerminalImpl#getTrPoint <em>Tr Point</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.SubStateTrPointTerminalImpl#getState <em>State</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointImpl.java
index fbe1e9852..85bfa01c2 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.fsm.fSM.TrPoint;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TrPointImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointTerminalImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointTerminalImpl.java
index 6f317502f..dfbb7ea8e 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointTerminalImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TrPointTerminalImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.fsm.fSM.TrPointTerminal;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TrPointTerminalImpl#getTrPoint <em>Tr Point</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionBaseImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionBaseImpl.java
new file mode 100644
index 000000000..3b4ea9f23
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionBaseImpl.java
@@ -0,0 +1,267 @@
+/**
+ */
+package org.eclipse.etrice.core.fsm.fSM.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.etrice.core.common.base.Documentation;
+
+import org.eclipse.etrice.core.fsm.fSM.DetailCode;
+import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
+import org.eclipse.etrice.core.fsm.fSM.TransitionBase;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Transition Base</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionBaseImpl#getDocu <em>Docu</em>}</li>
+ *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionBaseImpl#getAction <em>Action</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TransitionBaseImpl extends MinimalEObjectImpl.Container implements TransitionBase
+{
+  /**
+   * The cached value of the '{@link #getDocu() <em>Docu</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDocu()
+   * @generated
+   * @ordered
+   */
+  protected Documentation docu;
+
+  /**
+   * The cached value of the '{@link #getAction() <em>Action</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getAction()
+   * @generated
+   * @ordered
+   */
+  protected DetailCode action;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected TransitionBaseImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return FSMPackage.Literals.TRANSITION_BASE;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Documentation getDocu()
+  {
+    return docu;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetDocu(Documentation newDocu, NotificationChain msgs)
+  {
+    Documentation oldDocu = docu;
+    docu = newDocu;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION_BASE__DOCU, oldDocu, newDocu);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDocu(Documentation newDocu)
+  {
+    if (newDocu != docu)
+    {
+      NotificationChain msgs = null;
+      if (docu != null)
+        msgs = ((InternalEObject)docu).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION_BASE__DOCU, null, msgs);
+      if (newDocu != null)
+        msgs = ((InternalEObject)newDocu).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION_BASE__DOCU, null, msgs);
+      msgs = basicSetDocu(newDocu, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION_BASE__DOCU, newDocu, newDocu));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DetailCode getAction()
+  {
+    return action;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetAction(DetailCode newAction, NotificationChain msgs)
+  {
+    DetailCode oldAction = action;
+    action = newAction;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION_BASE__ACTION, oldAction, newAction);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setAction(DetailCode newAction)
+  {
+    if (newAction != action)
+    {
+      NotificationChain msgs = null;
+      if (action != null)
+        msgs = ((InternalEObject)action).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION_BASE__ACTION, null, msgs);
+      if (newAction != null)
+        msgs = ((InternalEObject)newAction).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION_BASE__ACTION, null, msgs);
+      msgs = basicSetAction(newAction, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION_BASE__ACTION, newAction, newAction));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case FSMPackage.TRANSITION_BASE__DOCU:
+        return basicSetDocu(null, msgs);
+      case FSMPackage.TRANSITION_BASE__ACTION:
+        return basicSetAction(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case FSMPackage.TRANSITION_BASE__DOCU:
+        return getDocu();
+      case FSMPackage.TRANSITION_BASE__ACTION:
+        return getAction();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case FSMPackage.TRANSITION_BASE__DOCU:
+        setDocu((Documentation)newValue);
+        return;
+      case FSMPackage.TRANSITION_BASE__ACTION:
+        setAction((DetailCode)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case FSMPackage.TRANSITION_BASE__DOCU:
+        setDocu((Documentation)null);
+        return;
+      case FSMPackage.TRANSITION_BASE__ACTION:
+        setAction((DetailCode)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case FSMPackage.TRANSITION_BASE__DOCU:
+        return docu != null;
+      case FSMPackage.TRANSITION_BASE__ACTION:
+        return action != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} //TransitionBaseImpl
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionChainStartTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionChainStartTransitionImpl.java
index a36988129..5e2145a5a 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionChainStartTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionChainStartTransitionImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionChainStartTransition;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Transition Chain Start Transition</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionImpl.java
index fdf2c7ab2..0e419c23f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.etrice.core.common.base.Documentation;
 import org.eclipse.etrice.core.fsm.fSM.DetailCode;
 import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
 import org.eclipse.etrice.core.fsm.fSM.Transition;
+import org.eclipse.etrice.core.fsm.fSM.TransitionBase;
 import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
 
 /**
@@ -23,67 +24,67 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl#getTo <em>To</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl#getAction <em>Action</em>}</li>
+ *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionImpl#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
 public class TransitionImpl extends StateGraphItemImpl implements Transition
 {
   /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The cached value of the '{@link #getDocu() <em>Docu</em>}' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getName()
+   * @see #getDocu()
    * @generated
    * @ordered
    */
-  protected static final String NAME_EDEFAULT = null;
+  protected Documentation docu;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The cached value of the '{@link #getAction() <em>Action</em>}' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getName()
+   * @see #getAction()
    * @generated
    * @ordered
    */
-  protected String name = NAME_EDEFAULT;
+  protected DetailCode action;
 
   /**
-   * The cached value of the '{@link #getTo() <em>To</em>}' containment reference.
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getTo()
+   * @see #getName()
    * @generated
    * @ordered
    */
-  protected TransitionTerminal to;
+  protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getDocu() <em>Docu</em>}' containment reference.
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getDocu()
+   * @see #getName()
    * @generated
    * @ordered
    */
-  protected Documentation docu;
+  protected String name = NAME_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getAction() <em>Action</em>}' containment reference.
+   * The cached value of the '{@link #getTo() <em>To</em>}' containment reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getAction()
+   * @see #getTo()
    * @generated
    * @ordered
    */
-  protected DetailCode action;
+  protected TransitionTerminal to;
 
   /**
    * <!-- begin-user-doc -->
@@ -111,32 +112,9 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TransitionTerminal getTo()
+  public Documentation getDocu()
   {
-    return to;
+    return docu;
   }
 
   /**
@@ -144,13 +122,13 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public NotificationChain basicSetTo(TransitionTerminal newTo, NotificationChain msgs)
+  public NotificationChain basicSetDocu(Documentation newDocu, NotificationChain msgs)
   {
-    TransitionTerminal oldTo = to;
-    to = newTo;
+    Documentation oldDocu = docu;
+    docu = newDocu;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__TO, oldTo, newTo);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__DOCU, oldDocu, newDocu);
       if (msgs == null) msgs = notification; else msgs.add(notification);
     }
     return msgs;
@@ -161,20 +139,20 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public void setTo(TransitionTerminal newTo)
+  public void setDocu(Documentation newDocu)
   {
-    if (newTo != to)
+    if (newDocu != docu)
     {
       NotificationChain msgs = null;
-      if (to != null)
-        msgs = ((InternalEObject)to).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__TO, null, msgs);
-      if (newTo != null)
-        msgs = ((InternalEObject)newTo).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__TO, null, msgs);
-      msgs = basicSetTo(newTo, msgs);
+      if (docu != null)
+        msgs = ((InternalEObject)docu).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__DOCU, null, msgs);
+      if (newDocu != null)
+        msgs = ((InternalEObject)newDocu).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__DOCU, null, msgs);
+      msgs = basicSetDocu(newDocu, msgs);
       if (msgs != null) msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__TO, newTo, newTo));
+      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__DOCU, newDocu, newDocu));
   }
 
   /**
@@ -182,9 +160,9 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public Documentation getDocu()
+  public DetailCode getAction()
   {
-    return docu;
+    return action;
   }
 
   /**
@@ -192,13 +170,13 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public NotificationChain basicSetDocu(Documentation newDocu, NotificationChain msgs)
+  public NotificationChain basicSetAction(DetailCode newAction, NotificationChain msgs)
   {
-    Documentation oldDocu = docu;
-    docu = newDocu;
+    DetailCode oldAction = action;
+    action = newAction;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__DOCU, oldDocu, newDocu);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__ACTION, oldAction, newAction);
       if (msgs == null) msgs = notification; else msgs.add(notification);
     }
     return msgs;
@@ -209,20 +187,20 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public void setDocu(Documentation newDocu)
+  public void setAction(DetailCode newAction)
   {
-    if (newDocu != docu)
+    if (newAction != action)
     {
       NotificationChain msgs = null;
-      if (docu != null)
-        msgs = ((InternalEObject)docu).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__DOCU, null, msgs);
-      if (newDocu != null)
-        msgs = ((InternalEObject)newDocu).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__DOCU, null, msgs);
-      msgs = basicSetDocu(newDocu, msgs);
+      if (action != null)
+        msgs = ((InternalEObject)action).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__ACTION, null, msgs);
+      if (newAction != null)
+        msgs = ((InternalEObject)newAction).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__ACTION, null, msgs);
+      msgs = basicSetAction(newAction, msgs);
       if (msgs != null) msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__DOCU, newDocu, newDocu));
+      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__ACTION, newAction, newAction));
   }
 
   /**
@@ -230,9 +208,9 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public DetailCode getAction()
+  public String getName()
   {
-    return action;
+    return name;
   }
 
   /**
@@ -240,13 +218,36 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public NotificationChain basicSetAction(DetailCode newAction, NotificationChain msgs)
+  public void setName(String newName)
   {
-    DetailCode oldAction = action;
-    action = newAction;
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__NAME, oldName, name));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public TransitionTerminal getTo()
+  {
+    return to;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetTo(TransitionTerminal newTo, NotificationChain msgs)
+  {
+    TransitionTerminal oldTo = to;
+    to = newTo;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__ACTION, oldAction, newAction);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__TO, oldTo, newTo);
       if (msgs == null) msgs = notification; else msgs.add(notification);
     }
     return msgs;
@@ -257,20 +258,20 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * <!-- end-user-doc -->
    * @generated
    */
-  public void setAction(DetailCode newAction)
+  public void setTo(TransitionTerminal newTo)
   {
-    if (newAction != action)
+    if (newTo != to)
     {
       NotificationChain msgs = null;
-      if (action != null)
-        msgs = ((InternalEObject)action).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__ACTION, null, msgs);
-      if (newAction != null)
-        msgs = ((InternalEObject)newAction).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__ACTION, null, msgs);
-      msgs = basicSetAction(newAction, msgs);
+      if (to != null)
+        msgs = ((InternalEObject)to).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__TO, null, msgs);
+      if (newTo != null)
+        msgs = ((InternalEObject)newTo).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FSMPackage.TRANSITION__TO, null, msgs);
+      msgs = basicSetTo(newTo, msgs);
       if (msgs != null) msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__ACTION, newAction, newAction));
+      eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.TRANSITION__TO, newTo, newTo));
   }
 
   /**
@@ -283,12 +284,12 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
   {
     switch (featureID)
     {
-      case FSMPackage.TRANSITION__TO:
-        return basicSetTo(null, msgs);
       case FSMPackage.TRANSITION__DOCU:
         return basicSetDocu(null, msgs);
       case FSMPackage.TRANSITION__ACTION:
         return basicSetAction(null, msgs);
+      case FSMPackage.TRANSITION__TO:
+        return basicSetTo(null, msgs);
     }
     return super.eInverseRemove(otherEnd, featureID, msgs);
   }
@@ -303,14 +304,14 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
   {
     switch (featureID)
     {
-      case FSMPackage.TRANSITION__NAME:
-        return getName();
-      case FSMPackage.TRANSITION__TO:
-        return getTo();
       case FSMPackage.TRANSITION__DOCU:
         return getDocu();
       case FSMPackage.TRANSITION__ACTION:
         return getAction();
+      case FSMPackage.TRANSITION__NAME:
+        return getName();
+      case FSMPackage.TRANSITION__TO:
+        return getTo();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -325,18 +326,18 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
   {
     switch (featureID)
     {
-      case FSMPackage.TRANSITION__NAME:
-        setName((String)newValue);
-        return;
-      case FSMPackage.TRANSITION__TO:
-        setTo((TransitionTerminal)newValue);
-        return;
       case FSMPackage.TRANSITION__DOCU:
         setDocu((Documentation)newValue);
         return;
       case FSMPackage.TRANSITION__ACTION:
         setAction((DetailCode)newValue);
         return;
+      case FSMPackage.TRANSITION__NAME:
+        setName((String)newValue);
+        return;
+      case FSMPackage.TRANSITION__TO:
+        setTo((TransitionTerminal)newValue);
+        return;
     }
     super.eSet(featureID, newValue);
   }
@@ -351,18 +352,18 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
   {
     switch (featureID)
     {
-      case FSMPackage.TRANSITION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case FSMPackage.TRANSITION__TO:
-        setTo((TransitionTerminal)null);
-        return;
       case FSMPackage.TRANSITION__DOCU:
         setDocu((Documentation)null);
         return;
       case FSMPackage.TRANSITION__ACTION:
         setAction((DetailCode)null);
         return;
+      case FSMPackage.TRANSITION__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+      case FSMPackage.TRANSITION__TO:
+        setTo((TransitionTerminal)null);
+        return;
     }
     super.eUnset(featureID);
   }
@@ -377,14 +378,14 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
   {
     switch (featureID)
     {
-      case FSMPackage.TRANSITION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case FSMPackage.TRANSITION__TO:
-        return to != null;
       case FSMPackage.TRANSITION__DOCU:
         return docu != null;
       case FSMPackage.TRANSITION__ACTION:
         return action != null;
+      case FSMPackage.TRANSITION__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+      case FSMPackage.TRANSITION__TO:
+        return to != null;
     }
     return super.eIsSet(featureID);
   }
@@ -395,6 +396,46 @@ public class TransitionImpl extends StateGraphItemImpl implements Transition
    * @generated
    */
   @Override
+  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+  {
+    if (baseClass == TransitionBase.class)
+    {
+      switch (derivedFeatureID)
+      {
+        case FSMPackage.TRANSITION__DOCU: return FSMPackage.TRANSITION_BASE__DOCU;
+        case FSMPackage.TRANSITION__ACTION: return FSMPackage.TRANSITION_BASE__ACTION;
+        default: return -1;
+      }
+    }
+    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+  {
+    if (baseClass == TransitionBase.class)
+    {
+      switch (baseFeatureID)
+      {
+        case FSMPackage.TRANSITION_BASE__DOCU: return FSMPackage.TRANSITION__DOCU;
+        case FSMPackage.TRANSITION_BASE__ACTION: return FSMPackage.TRANSITION__ACTION;
+        default: return -1;
+      }
+    }
+    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
   public String toString()
   {
     if (eIsProxy()) return super.toString();
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionPointImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionPointImpl.java
index f03762468..8d67b5c8f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionPointImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionPoint;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TransitionPointImpl#isHandler <em>Handler</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionTerminalImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionTerminalImpl.java
index 99b84db26..554653d25 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionTerminalImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TransitionTerminalImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Transition Terminal</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggerImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggerImpl.java
index 3941566a7..935b7fc2e 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggerImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggerImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.etrice.core.fsm.fSM.Trigger;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TriggerImpl#getMsgFromIfPairs <em>Msg From If Pairs</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TriggerImpl#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggeredTransitionImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggeredTransitionImpl.java
index 975654fb3..fc4660990 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggeredTransitionImpl.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/TriggeredTransitionImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.fsm.fSM.impl.TriggeredTransitionImpl#getTriggers <em>Triggers</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMAdapterFactory.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMAdapterFactory.java
index 654f69d2f..68987b251 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMAdapterFactory.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMAdapterFactory.java
@@ -145,6 +145,11 @@ public class FSMAdapterFactory extends AdapterFactoryImpl
         return createChoicePointAdapter();
       }
       @Override
+      public Adapter caseTransitionBase(TransitionBase object)
+      {
+        return createTransitionBaseAdapter();
+      }
+      @Override
       public Adapter caseTransition(Transition object)
       {
         return createTransitionAdapter();
@@ -492,6 +497,21 @@ public class FSMAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.fsm.fSM.TransitionBase <em>Transition Base</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.etrice.core.fsm.fSM.TransitionBase
+   * @generated
+   */
+  public Adapter createTransitionBaseAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for an object of class '{@link org.eclipse.etrice.core.fsm.fSM.Transition <em>Transition</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMSwitch.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMSwitch.java
index fcdd62539..6240d332c 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMSwitch.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/util/FSMSwitch.java
@@ -50,7 +50,7 @@ public class FSMSwitch<T> extends Switch<T>
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
@@ -193,11 +193,19 @@ public class FSMSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
+      case FSMPackage.TRANSITION_BASE:
+      {
+        TransitionBase transitionBase = (TransitionBase)theEObject;
+        T result = caseTransitionBase(transitionBase);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
       case FSMPackage.TRANSITION:
       {
         Transition transition = (Transition)theEObject;
         T result = caseTransition(transition);
         if (result == null) result = caseStateGraphItem(transition);
+        if (result == null) result = caseTransitionBase(transition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -207,6 +215,7 @@ public class FSMSwitch<T> extends Switch<T>
         T result = caseNonInitialTransition(nonInitialTransition);
         if (result == null) result = caseTransition(nonInitialTransition);
         if (result == null) result = caseStateGraphItem(nonInitialTransition);
+        if (result == null) result = caseTransitionBase(nonInitialTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -217,6 +226,7 @@ public class FSMSwitch<T> extends Switch<T>
         if (result == null) result = caseNonInitialTransition(transitionChainStartTransition);
         if (result == null) result = caseTransition(transitionChainStartTransition);
         if (result == null) result = caseStateGraphItem(transitionChainStartTransition);
+        if (result == null) result = caseTransitionBase(transitionChainStartTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -226,6 +236,7 @@ public class FSMSwitch<T> extends Switch<T>
         T result = caseInitialTransition(initialTransition);
         if (result == null) result = caseTransition(initialTransition);
         if (result == null) result = caseStateGraphItem(initialTransition);
+        if (result == null) result = caseTransitionBase(initialTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -236,6 +247,7 @@ public class FSMSwitch<T> extends Switch<T>
         if (result == null) result = caseNonInitialTransition(continuationTransition);
         if (result == null) result = caseTransition(continuationTransition);
         if (result == null) result = caseStateGraphItem(continuationTransition);
+        if (result == null) result = caseTransitionBase(continuationTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -247,6 +259,7 @@ public class FSMSwitch<T> extends Switch<T>
         if (result == null) result = caseNonInitialTransition(triggeredTransition);
         if (result == null) result = caseTransition(triggeredTransition);
         if (result == null) result = caseStateGraphItem(triggeredTransition);
+        if (result == null) result = caseTransitionBase(triggeredTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -258,6 +271,7 @@ public class FSMSwitch<T> extends Switch<T>
         if (result == null) result = caseNonInitialTransition(guardedTransition);
         if (result == null) result = caseTransition(guardedTransition);
         if (result == null) result = caseStateGraphItem(guardedTransition);
+        if (result == null) result = caseTransitionBase(guardedTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -268,6 +282,7 @@ public class FSMSwitch<T> extends Switch<T>
         if (result == null) result = caseNonInitialTransition(cpBranchTransition);
         if (result == null) result = caseTransition(cpBranchTransition);
         if (result == null) result = caseStateGraphItem(cpBranchTransition);
+        if (result == null) result = caseTransitionBase(cpBranchTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -275,6 +290,7 @@ public class FSMSwitch<T> extends Switch<T>
       {
         RefinedTransition refinedTransition = (RefinedTransition)theEObject;
         T result = caseRefinedTransition(refinedTransition);
+        if (result == null) result = caseTransitionBase(refinedTransition);
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
@@ -611,6 +627,22 @@ public class FSMSwitch<T> extends Switch<T>
   }
 
   /**
+   * Returns the result of interpreting the object as an instance of '<em>Transition Base</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Transition Base</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseTransitionBase(TransitionBase object)
+  {
+    return null;
+  }
+
+  /**
    * Returns the result of interpreting the object as an instance of '<em>Transition</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMAntlrTokenFileProvider.java
index 7681f30b9..b15b8d82e 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class FSMAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.tokens");
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMParser.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMParser.java
index 44aea2cbb..1e60f03b4 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMParser.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/FSMParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g
index 4db24b617..68bd38f3a 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalFSM;
 
 options {
@@ -91,7 +91,7 @@ ruleFSMModel returns [EObject current=null]
        			$current, 
        			"components",
         		lv_components_0_0, 
-        		"ModelComponent");
+        		"org.eclipse.etrice.core.fsm.FSM.ModelComponent");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -171,7 +171,7 @@ ruleModelComponent returns [EObject current=null]
        			$current, 
        			"commType",
         		lv_commType_2_0, 
-        		"ComponentCommunicationType");
+        		"org.eclipse.etrice.core.fsm.FSM.ComponentCommunicationType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -208,7 +208,7 @@ ruleModelComponent returns [EObject current=null]
        			$current, 
        			"componentName",
         		lv_componentName_4_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -244,7 +244,7 @@ ruleModelComponent returns [EObject current=null]
        			$current, 
        			"stateMachine",
         		lv_stateMachine_7_0, 
-        		"StateMachine");
+        		"org.eclipse.etrice.core.fsm.FSM.StateMachine");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -345,7 +345,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"states",
         		lv_states_2_0, 
-        		"State");
+        		"org.eclipse.etrice.core.fsm.FSM.State");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -364,7 +364,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"trPoints",
         		lv_trPoints_3_0, 
-        		"TrPoint");
+        		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -383,7 +383,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"chPoints",
         		lv_chPoints_4_0, 
-        		"ChoicePoint");
+        		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -402,7 +402,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"transitions",
         		lv_transitions_5_0, 
-        		"Transition");
+        		"org.eclipse.etrice.core.fsm.FSM.Transition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -421,7 +421,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"refinedTransitions",
         		lv_refinedTransitions_6_0, 
-        		"RefinedTransition");
+        		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -478,7 +478,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"states",
         		lv_states_3_0, 
-        		"State");
+        		"org.eclipse.etrice.core.fsm.FSM.State");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -497,7 +497,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"trPoints",
         		lv_trPoints_4_0, 
-        		"TrPoint");
+        		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -516,7 +516,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"chPoints",
         		lv_chPoints_5_0, 
-        		"ChoicePoint");
+        		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -535,7 +535,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"transitions",
         		lv_transitions_6_0, 
-        		"Transition");
+        		"org.eclipse.etrice.core.fsm.FSM.Transition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -554,7 +554,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"refinedTransitions",
         		lv_refinedTransitions_7_0, 
-        		"RefinedTransition");
+        		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -642,7 +642,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -659,7 +659,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -685,7 +685,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"entryCode",
         		lv_entryCode_5_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -707,7 +707,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"exitCode",
         		lv_exitCode_7_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -729,7 +729,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"doCode",
         		lv_doCode_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -751,7 +751,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"subgraph",
         		lv_subgraph_11_0, 
-        		"StateGraph");
+        		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -813,7 +813,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -839,7 +839,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"entryCode",
         		lv_entryCode_5_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -861,7 +861,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"exitCode",
         		lv_exitCode_7_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -883,7 +883,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"doCode",
         		lv_doCode_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -905,7 +905,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"subgraph",
         		lv_subgraph_11_0, 
-        		"StateGraph");
+        		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -970,7 +970,7 @@ ruleDetailCode returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1082,7 +1082,7 @@ ruleTransitionPoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1125,7 +1125,7 @@ ruleEntryPoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1168,7 +1168,7 @@ ruleExitPoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1211,7 +1211,7 @@ ruleChoicePoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1228,7 +1228,7 @@ ruleChoicePoint returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1240,6 +1240,8 @@ ruleChoicePoint returns [EObject current=null]
 
 
 
+
+
 // Entry rule entryRuleTransition
 entryRuleTransition returns [EObject current=null] 
 	:
@@ -1402,7 +1404,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1431,7 +1433,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1449,7 +1451,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1475,7 +1477,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1523,7 +1525,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1544,7 +1546,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1566,7 +1568,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1584,7 +1586,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1610,7 +1612,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1658,7 +1660,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1679,7 +1681,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1701,7 +1703,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1719,7 +1721,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1749,7 +1751,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"triggers",
         		lv_triggers_10_0, 
-        		"Trigger");
+        		"org.eclipse.etrice.core.fsm.FSM.Trigger");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1771,7 +1773,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"triggers",
         		lv_triggers_12_0, 
-        		"Trigger");
+        		"org.eclipse.etrice.core.fsm.FSM.Trigger");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1797,7 +1799,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_15_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1845,7 +1847,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1866,7 +1868,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1888,7 +1890,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1906,7 +1908,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1932,7 +1934,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1954,7 +1956,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_11_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2002,7 +2004,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -2023,7 +2025,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2045,7 +2047,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2063,7 +2065,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2089,7 +2091,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2111,7 +2113,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_11_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2173,7 +2175,7 @@ ruleRefinedTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2199,7 +2201,7 @@ ruleRefinedTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_5_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2467,7 +2469,7 @@ ruleTrigger returns [EObject current=null]
        			$current, 
        			"msgFromIfPairs",
         		lv_msgFromIfPairs_1_0, 
-        		"MessageFromIf");
+        		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2489,7 +2491,7 @@ ruleTrigger returns [EObject current=null]
        			$current, 
        			"msgFromIfPairs",
         		lv_msgFromIfPairs_3_0, 
-        		"MessageFromIf");
+        		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2507,7 +2509,7 @@ ruleTrigger returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_4_0, 
-        		"Guard");
+        		"org.eclipse.etrice.core.fsm.FSM.Guard");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2607,7 +2609,7 @@ ruleGuard returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_1_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2713,7 +2715,7 @@ ruleInSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_4_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2736,7 +2738,7 @@ ruleInSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_6_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2758,7 +2760,7 @@ ruleInSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_8_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2826,7 +2828,7 @@ ruleOutSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_4_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2849,7 +2851,7 @@ ruleOutSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_6_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2871,7 +2873,7 @@ ruleOutSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_8_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2917,7 +2919,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -2938,7 +2940,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3072,7 +3074,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3093,7 +3095,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3157,7 +3159,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3183,7 +3185,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -3205,7 +3207,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -3298,7 +3300,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -3487,7 +3489,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3532,7 +3534,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3578,7 +3580,7 @@ ruleStringLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMLexer.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMLexer.java
index 107c35a4a..cda30c659 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMLexer.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMLexer.java
@@ -93,15 +93,15 @@ public class InternalFSMLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g"; }
+    public String getGrammarFileName() { return "InternalFSM.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:11:7: ( 'abstract' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:11:9: 'abstract'
+            // InternalFSM.g:11:7: ( 'abstract' )
+            // InternalFSM.g:11:9: 'abstract'
             {
             match("abstract"); 
 
@@ -121,8 +121,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:12:7: ( 'ModelComponent' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:12:9: 'ModelComponent'
+            // InternalFSM.g:12:7: ( 'ModelComponent' )
+            // InternalFSM.g:12:9: 'ModelComponent'
             {
             match("ModelComponent"); 
 
@@ -142,8 +142,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:13:7: ( 'extends' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:13:9: 'extends'
+            // InternalFSM.g:13:7: ( 'extends' )
+            // InternalFSM.g:13:9: 'extends'
             {
             match("extends"); 
 
@@ -163,8 +163,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:14:7: ( '{' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:14:9: '{'
+            // InternalFSM.g:14:7: ( '{' )
+            // InternalFSM.g:14:9: '{'
             {
             match('{'); 
 
@@ -183,8 +183,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:15:7: ( '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:15:9: '}'
+            // InternalFSM.g:15:7: ( '}' )
+            // InternalFSM.g:15:9: '}'
             {
             match('}'); 
 
@@ -203,8 +203,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:16:7: ( 'StateMachine' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:16:9: 'StateMachine'
+            // InternalFSM.g:16:7: ( 'StateMachine' )
+            // InternalFSM.g:16:9: 'StateMachine'
             {
             match("StateMachine"); 
 
@@ -224,8 +224,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:17:7: ( 'State' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:17:9: 'State'
+            // InternalFSM.g:17:7: ( 'State' )
+            // InternalFSM.g:17:9: 'State'
             {
             match("State"); 
 
@@ -245,8 +245,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:18:7: ( 'entry' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:18:9: 'entry'
+            // InternalFSM.g:18:7: ( 'entry' )
+            // InternalFSM.g:18:9: 'entry'
             {
             match("entry"); 
 
@@ -266,8 +266,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:19:7: ( 'exit' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:19:9: 'exit'
+            // InternalFSM.g:19:7: ( 'exit' )
+            // InternalFSM.g:19:9: 'exit'
             {
             match("exit"); 
 
@@ -287,8 +287,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:20:7: ( 'do' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:20:9: 'do'
+            // InternalFSM.g:20:7: ( 'do' )
+            // InternalFSM.g:20:9: 'do'
             {
             match("do"); 
 
@@ -308,8 +308,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:21:7: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:21:9: 'subgraph'
+            // InternalFSM.g:21:7: ( 'subgraph' )
+            // InternalFSM.g:21:9: 'subgraph'
             {
             match("subgraph"); 
 
@@ -329,8 +329,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:22:7: ( 'RefinedState' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:22:9: 'RefinedState'
+            // InternalFSM.g:22:7: ( 'RefinedState' )
+            // InternalFSM.g:22:9: 'RefinedState'
             {
             match("RefinedState"); 
 
@@ -350,8 +350,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:23:7: ( 'handler' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:23:9: 'handler'
+            // InternalFSM.g:23:7: ( 'handler' )
+            // InternalFSM.g:23:9: 'handler'
             {
             match("handler"); 
 
@@ -371,8 +371,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:24:7: ( 'TransitionPoint' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:24:9: 'TransitionPoint'
+            // InternalFSM.g:24:7: ( 'TransitionPoint' )
+            // InternalFSM.g:24:9: 'TransitionPoint'
             {
             match("TransitionPoint"); 
 
@@ -392,8 +392,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:25:7: ( 'EntryPoint' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:25:9: 'EntryPoint'
+            // InternalFSM.g:25:7: ( 'EntryPoint' )
+            // InternalFSM.g:25:9: 'EntryPoint'
             {
             match("EntryPoint"); 
 
@@ -413,8 +413,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:26:7: ( 'ExitPoint' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:26:9: 'ExitPoint'
+            // InternalFSM.g:26:7: ( 'ExitPoint' )
+            // InternalFSM.g:26:9: 'ExitPoint'
             {
             match("ExitPoint"); 
 
@@ -434,8 +434,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:27:7: ( 'ChoicePoint' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:27:9: 'ChoicePoint'
+            // InternalFSM.g:27:7: ( 'ChoicePoint' )
+            // InternalFSM.g:27:9: 'ChoicePoint'
             {
             match("ChoicePoint"); 
 
@@ -455,8 +455,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:28:7: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:28:9: 'Transition'
+            // InternalFSM.g:28:7: ( 'Transition' )
+            // InternalFSM.g:28:9: 'Transition'
             {
             match("Transition"); 
 
@@ -476,8 +476,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:29:7: ( ':' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:29:9: ':'
+            // InternalFSM.g:29:7: ( ':' )
+            // InternalFSM.g:29:9: ':'
             {
             match(':'); 
 
@@ -496,8 +496,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:30:7: ( 'initial' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:30:9: 'initial'
+            // InternalFSM.g:30:7: ( 'initial' )
+            // InternalFSM.g:30:9: 'initial'
             {
             match("initial"); 
 
@@ -517,8 +517,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:31:7: ( '->' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:31:9: '->'
+            // InternalFSM.g:31:7: ( '->' )
+            // InternalFSM.g:31:9: '->'
             {
             match("->"); 
 
@@ -538,8 +538,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:32:7: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:32:9: 'action'
+            // InternalFSM.g:32:7: ( 'action' )
+            // InternalFSM.g:32:9: 'action'
             {
             match("action"); 
 
@@ -559,8 +559,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:33:7: ( 'triggers' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:33:9: 'triggers'
+            // InternalFSM.g:33:7: ( 'triggers' )
+            // InternalFSM.g:33:9: 'triggers'
             {
             match("triggers"); 
 
@@ -580,8 +580,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:34:7: ( 'or' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:34:9: 'or'
+            // InternalFSM.g:34:7: ( 'or' )
+            // InternalFSM.g:34:9: 'or'
             {
             match("or"); 
 
@@ -601,8 +601,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:35:7: ( 'guard' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:35:9: 'guard'
+            // InternalFSM.g:35:7: ( 'guard' )
+            // InternalFSM.g:35:9: 'guard'
             {
             match("guard"); 
 
@@ -622,8 +622,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:36:7: ( 'cond' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:36:9: 'cond'
+            // InternalFSM.g:36:7: ( 'cond' )
+            // InternalFSM.g:36:9: 'cond'
             {
             match("cond"); 
 
@@ -643,8 +643,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:37:7: ( 'RefinedTransition' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:37:9: 'RefinedTransition'
+            // InternalFSM.g:37:7: ( 'RefinedTransition' )
+            // InternalFSM.g:37:9: 'RefinedTransition'
             {
             match("RefinedTransition"); 
 
@@ -664,8 +664,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:38:7: ( 'my' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:38:9: 'my'
+            // InternalFSM.g:38:7: ( 'my' )
+            // InternalFSM.g:38:9: 'my'
             {
             match("my"); 
 
@@ -685,8 +685,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:39:7: ( 'of' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:39:9: 'of'
+            // InternalFSM.g:39:7: ( 'of' )
+            // InternalFSM.g:39:9: 'of'
             {
             match("of"); 
 
@@ -706,8 +706,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:40:7: ( 'cp' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:40:9: 'cp'
+            // InternalFSM.g:40:7: ( 'cp' )
+            // InternalFSM.g:40:9: 'cp'
             {
             match("cp"); 
 
@@ -727,8 +727,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:41:7: ( '<' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:41:9: '<'
+            // InternalFSM.g:41:7: ( '<' )
+            // InternalFSM.g:41:9: '<'
             {
             match('<'); 
 
@@ -747,8 +747,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:42:7: ( '|' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:42:9: '|'
+            // InternalFSM.g:42:7: ( '|' )
+            // InternalFSM.g:42:9: '|'
             {
             match('|'); 
 
@@ -767,8 +767,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:43:7: ( '>' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:43:9: '>'
+            // InternalFSM.g:43:7: ( '>' )
+            // InternalFSM.g:43:9: '>'
             {
             match('>'); 
 
@@ -787,8 +787,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:44:7: ( 'in' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:44:9: 'in'
+            // InternalFSM.g:44:7: ( 'in' )
+            // InternalFSM.g:44:9: 'in'
             {
             match("in"); 
 
@@ -808,8 +808,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:45:7: ( '(' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:45:9: '('
+            // InternalFSM.g:45:7: ( '(' )
+            // InternalFSM.g:45:9: '('
             {
             match('('); 
 
@@ -828,8 +828,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:46:7: ( ',' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:46:9: ','
+            // InternalFSM.g:46:7: ( ',' )
+            // InternalFSM.g:46:9: ','
             {
             match(','); 
 
@@ -848,8 +848,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:47:7: ( ')' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:47:9: ')'
+            // InternalFSM.g:47:7: ( ')' )
+            // InternalFSM.g:47:9: ')'
             {
             match(')'); 
 
@@ -868,8 +868,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:48:7: ( 'out' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:48:9: 'out'
+            // InternalFSM.g:48:7: ( 'out' )
+            // InternalFSM.g:48:9: 'out'
             {
             match("out"); 
 
@@ -889,8 +889,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:49:7: ( '=' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:49:9: '='
+            // InternalFSM.g:49:7: ( '=' )
+            // InternalFSM.g:49:9: '='
             {
             match('='); 
 
@@ -909,8 +909,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:50:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:50:9: 'optional'
+            // InternalFSM.g:50:7: ( 'optional' )
+            // InternalFSM.g:50:9: 'optional'
             {
             match("optional"); 
 
@@ -930,8 +930,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:51:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:51:9: 'mandatory'
+            // InternalFSM.g:51:7: ( 'mandatory' )
+            // InternalFSM.g:51:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -951,8 +951,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:52:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:52:9: 'attribute'
+            // InternalFSM.g:52:7: ( 'attribute' )
+            // InternalFSM.g:52:9: 'attribute'
             {
             match("attribute"); 
 
@@ -972,8 +972,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:53:7: ( '.*' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:53:9: '.*'
+            // InternalFSM.g:53:7: ( '.*' )
+            // InternalFSM.g:53:9: '.*'
             {
             match(".*"); 
 
@@ -993,8 +993,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:54:7: ( '[' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:54:9: '['
+            // InternalFSM.g:54:7: ( '[' )
+            // InternalFSM.g:54:9: '['
             {
             match('['); 
 
@@ -1013,8 +1013,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:55:7: ( ']' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:55:9: ']'
+            // InternalFSM.g:55:7: ( ']' )
+            // InternalFSM.g:55:9: ']'
             {
             match(']'); 
 
@@ -1033,8 +1033,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:56:7: ( 'false' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:56:9: 'false'
+            // InternalFSM.g:56:7: ( 'false' )
+            // InternalFSM.g:56:9: 'false'
             {
             match("false"); 
 
@@ -1054,8 +1054,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:57:7: ( 'true' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:57:9: 'true'
+            // InternalFSM.g:57:7: ( 'true' )
+            // InternalFSM.g:57:9: 'true'
             {
             match("true"); 
 
@@ -1075,8 +1075,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:58:7: ( '+' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:58:9: '+'
+            // InternalFSM.g:58:7: ( '+' )
+            // InternalFSM.g:58:9: '+'
             {
             match('+'); 
 
@@ -1095,8 +1095,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:59:7: ( '-' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:59:9: '-'
+            // InternalFSM.g:59:7: ( '-' )
+            // InternalFSM.g:59:9: '-'
             {
             match('-'); 
 
@@ -1115,8 +1115,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:60:7: ( '.' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:60:9: '.'
+            // InternalFSM.g:60:7: ( '.' )
+            // InternalFSM.g:60:9: '.'
             {
             match('.'); 
 
@@ -1135,8 +1135,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:61:7: ( 'e' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:61:9: 'e'
+            // InternalFSM.g:61:7: ( 'e' )
+            // InternalFSM.g:61:9: 'e'
             {
             match('e'); 
 
@@ -1155,8 +1155,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:62:7: ( 'E' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:62:9: 'E'
+            // InternalFSM.g:62:7: ( 'E' )
+            // InternalFSM.g:62:9: 'E'
             {
             match('E'); 
 
@@ -1175,8 +1175,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:63:7: ( 'eventdriven' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:63:9: 'eventdriven'
+            // InternalFSM.g:63:7: ( 'eventdriven' )
+            // InternalFSM.g:63:9: 'eventdriven'
             {
             match("eventdriven"); 
 
@@ -1196,8 +1196,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:64:7: ( 'datadriven' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:64:9: 'datadriven'
+            // InternalFSM.g:64:7: ( 'datadriven' )
+            // InternalFSM.g:64:9: 'datadriven'
             {
             match("datadriven"); 
 
@@ -1217,8 +1217,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:65:7: ( 'async' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:65:9: 'async'
+            // InternalFSM.g:65:7: ( 'async' )
+            // InternalFSM.g:65:9: 'async'
             {
             match("async"); 
 
@@ -1238,8 +1238,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:66:7: ( 'sync' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:66:9: 'sync'
+            // InternalFSM.g:66:7: ( 'sync' )
+            // InternalFSM.g:66:9: 'sync'
             {
             match("sync"); 
 
@@ -1259,8 +1259,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:67:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:67:9: 'ptBoolean'
+            // InternalFSM.g:67:7: ( 'ptBoolean' )
+            // InternalFSM.g:67:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -1280,8 +1280,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:68:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:68:9: 'ptInteger'
+            // InternalFSM.g:68:7: ( 'ptInteger' )
+            // InternalFSM.g:68:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -1301,8 +1301,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:69:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:69:9: 'ptReal'
+            // InternalFSM.g:69:7: ( 'ptReal' )
+            // InternalFSM.g:69:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -1322,8 +1322,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:70:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:70:9: 'ptCharacter'
+            // InternalFSM.g:70:7: ( 'ptCharacter' )
+            // InternalFSM.g:70:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -1343,10 +1343,10 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3949:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3949:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalFSM.g:3951:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalFSM.g:3951:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3949:12: ( '0x' | '0X' )
+            // InternalFSM.g:3951:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1374,7 +1374,7 @@ public class InternalFSMLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3949:13: '0x'
+                    // InternalFSM.g:3951:13: '0x'
                     {
                     match("0x"); 
 
@@ -1382,7 +1382,7 @@ public class InternalFSMLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3949:18: '0X'
+                    // InternalFSM.g:3951:18: '0X'
                     {
                     match("0X"); 
 
@@ -1392,7 +1392,7 @@ public class InternalFSMLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3949:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalFSM.g:3951:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -1406,7 +1406,7 @@ public class InternalFSMLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:
+            	    // InternalFSM.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -1446,10 +1446,10 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3951:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3951:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalFSM.g:3953:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalFSM.g:3953:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3951:11: ( '^' )?
+            // InternalFSM.g:3953:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1458,7 +1458,7 @@ public class InternalFSMLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3951:11: '^'
+                    // InternalFSM.g:3953:11: '^'
                     {
                     match('^'); 
 
@@ -1476,7 +1476,7 @@ public class InternalFSMLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3951:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalFSM.g:3953:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1489,7 +1489,7 @@ public class InternalFSMLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:
+            	    // InternalFSM.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1525,10 +1525,10 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3953:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3953:12: ( '0' .. '9' )+
+            // InternalFSM.g:3955:10: ( ( '0' .. '9' )+ )
+            // InternalFSM.g:3955:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3953:12: ( '0' .. '9' )+
+            // InternalFSM.g:3955:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1542,7 +1542,7 @@ public class InternalFSMLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3953:13: '0' .. '9'
+            	    // InternalFSM.g:3955:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1574,10 +1574,10 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalFSM.g:3957:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalFSM.g:3957:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalFSM.g:3957:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1595,10 +1595,10 @@ public class InternalFSMLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalFSM.g:3957:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalFSM.g:3957:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1614,7 +1614,7 @@ public class InternalFSMLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:21: '\\\\' .
+                    	    // InternalFSM.g:3957:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1622,7 +1622,7 @@ public class InternalFSMLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalFSM.g:3957:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1647,10 +1647,10 @@ public class InternalFSMLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalFSM.g:3957:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalFSM.g:3957:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1666,7 +1666,7 @@ public class InternalFSMLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:54: '\\\\' .
+                    	    // InternalFSM.g:3957:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1674,7 +1674,7 @@ public class InternalFSMLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3955:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalFSM.g:3957:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1717,12 +1717,12 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3957:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3957:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalFSM.g:3959:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalFSM.g:3959:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3957:24: ( options {greedy=false; } : . )*
+            // InternalFSM.g:3959:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1747,7 +1747,7 @@ public class InternalFSMLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3957:52: .
+            	    // InternalFSM.g:3959:52: .
             	    {
             	    matchAny(); 
 
@@ -1777,12 +1777,12 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalFSM.g:3961:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalFSM.g:3961:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalFSM.g:3961:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1795,7 +1795,7 @@ public class InternalFSMLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalFSM.g:3961:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1815,7 +1815,7 @@ public class InternalFSMLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:40: ( ( '\\r' )? '\\n' )?
+            // InternalFSM.g:3961:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1824,9 +1824,9 @@ public class InternalFSMLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:41: ( '\\r' )? '\\n'
+                    // InternalFSM.g:3961:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:41: ( '\\r' )?
+                    // InternalFSM.g:3961:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1835,7 +1835,7 @@ public class InternalFSMLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3959:41: '\\r'
+                            // InternalFSM.g:3961:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1867,10 +1867,10 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3961:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3961:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFSM.g:3963:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalFSM.g:3963:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3961:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFSM.g:3963:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1884,7 +1884,7 @@ public class InternalFSMLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:
+            	    // InternalFSM.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1924,8 +1924,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3963:16: ( . )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3963:18: .
+            // InternalFSM.g:3965:16: ( . )
+            // InternalFSM.g:3965:18: .
             {
             matchAny(); 
 
@@ -1940,481 +1940,481 @@ public class InternalFSMLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalFSM.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=68;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:10: T__12
+                // InternalFSM.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:16: T__13
+                // InternalFSM.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:22: T__14
+                // InternalFSM.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:28: T__15
+                // InternalFSM.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:34: T__16
+                // InternalFSM.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:40: T__17
+                // InternalFSM.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:46: T__18
+                // InternalFSM.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:52: T__19
+                // InternalFSM.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:58: T__20
+                // InternalFSM.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:64: T__21
+                // InternalFSM.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:70: T__22
+                // InternalFSM.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:76: T__23
+                // InternalFSM.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:82: T__24
+                // InternalFSM.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:88: T__25
+                // InternalFSM.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:94: T__26
+                // InternalFSM.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:100: T__27
+                // InternalFSM.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:106: T__28
+                // InternalFSM.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:112: T__29
+                // InternalFSM.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:118: T__30
+                // InternalFSM.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:124: T__31
+                // InternalFSM.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:130: T__32
+                // InternalFSM.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:136: T__33
+                // InternalFSM.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:142: T__34
+                // InternalFSM.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:148: T__35
+                // InternalFSM.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:154: T__36
+                // InternalFSM.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:160: T__37
+                // InternalFSM.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:166: T__38
+                // InternalFSM.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:172: T__39
+                // InternalFSM.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:178: T__40
+                // InternalFSM.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:184: T__41
+                // InternalFSM.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:190: T__42
+                // InternalFSM.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:196: T__43
+                // InternalFSM.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:202: T__44
+                // InternalFSM.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:208: T__45
+                // InternalFSM.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:214: T__46
+                // InternalFSM.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:220: T__47
+                // InternalFSM.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:226: T__48
+                // InternalFSM.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:232: T__49
+                // InternalFSM.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:238: T__50
+                // InternalFSM.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:244: T__51
+                // InternalFSM.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:250: T__52
+                // InternalFSM.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:256: T__53
+                // InternalFSM.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:262: T__54
+                // InternalFSM.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:268: T__55
+                // InternalFSM.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:274: T__56
+                // InternalFSM.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:280: T__57
+                // InternalFSM.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:286: T__58
+                // InternalFSM.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:292: T__59
+                // InternalFSM.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:298: T__60
+                // InternalFSM.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:304: T__61
+                // InternalFSM.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:310: T__62
+                // InternalFSM.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:316: T__63
+                // InternalFSM.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:322: T__64
+                // InternalFSM.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:328: T__65
+                // InternalFSM.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:334: T__66
+                // InternalFSM.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:340: T__67
+                // InternalFSM.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:346: T__68
+                // InternalFSM.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:352: T__69
+                // InternalFSM.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:358: T__70
+                // InternalFSM.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:364: T__71
+                // InternalFSM.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:370: RULE_HEX
+                // InternalFSM.g:1:370: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 62 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:379: RULE_ID
+                // InternalFSM.g:1:379: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 63 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:387: RULE_INT
+                // InternalFSM.g:1:387: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 64 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:396: RULE_STRING
+                // InternalFSM.g:1:396: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 65 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:408: RULE_ML_COMMENT
+                // InternalFSM.g:1:408: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 66 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:424: RULE_SL_COMMENT
+                // InternalFSM.g:1:424: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 67 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:440: RULE_WS
+                // InternalFSM.g:1:440: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 68 :
-                // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1:448: RULE_ANY_OTHER
+                // InternalFSM.g:1:448: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2428,110 +2428,22 @@ public class InternalFSMLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\2\60\1\65\2\uffff\6\60\1\102\1\60\1\uffff\1\60\1\107\5"+
-        "\60\7\uffff\1\132\2\uffff\1\60\1\uffff\1\60\1\141\1\53\2\uffff\3"+
-        "\53\2\uffff\4\60\1\uffff\4\60\3\uffff\1\60\1\160\10\60\1\uffff\1"+
-        "\60\1\uffff\1\173\2\uffff\1\60\1\176\1\177\4\60\1\u0084\1\u0085"+
-        "\1\60\13\uffff\1\60\1\uffff\1\60\6\uffff\12\60\1\uffff\12\60\1\uffff"+
-        "\2\60\2\uffff\1\u00a2\3\60\2\uffff\14\60\1\u00b2\5\60\1\u00b8\10"+
-        "\60\1\u00c1\1\uffff\2\60\1\u00c4\11\60\1\u00ce\2\60\1\uffff\1\u00d1"+
-        "\1\60\1\u00d4\2\60\1\uffff\10\60\1\uffff\1\60\1\u00e0\1\uffff\1"+
-        "\60\1\u00e2\5\60\1\u00e8\1\60\1\uffff\2\60\1\uffff\2\60\1\uffff"+
-        "\13\60\1\uffff\1\60\1\uffff\2\60\1\u00fc\2\60\1\uffff\2\60\1\u0101"+
-        "\5\60\1\u0108\4\60\1\u010d\5\60\1\uffff\1\60\1\u0114\2\60\1\uffff"+
-        "\3\60\1\u011a\2\60\1\uffff\4\60\1\uffff\1\u0121\1\u0122\4\60\1\uffff"+
-        "\1\u0127\4\60\1\uffff\4\60\1\u0130\1\60\2\uffff\1\u0132\1\u0133"+
-        "\1\u0134\1\60\1\uffff\3\60\1\u0139\2\60\1\u013d\1\u013e\1\uffff"+
-        "\1\60\3\uffff\2\60\1\u0142\1\60\1\uffff\3\60\2\uffff\1\u0147\1\u0148"+
-        "\1\60\1\uffff\1\u014a\1\u014b\2\60\2\uffff\1\60\2\uffff\2\60\1\u0151"+
-        "\2\60\1\uffff\1\60\1\u0155\1\60\1\uffff\1\u0157\1\uffff";
+        "\1\uffff\2\60\1\65\2\uffff\6\60\1\102\1\60\1\uffff\1\60\1\107\5\60\7\uffff\1\132\2\uffff\1\60\1\uffff\1\60\1\141\1\53\2\uffff\3\53\2\uffff\4\60\1\uffff\4\60\3\uffff\1\60\1\160\10\60\1\uffff\1\60\1\uffff\1\173\2\uffff\1\60\1\176\1\177\4\60\1\u0084\1\u0085\1\60\13\uffff\1\60\1\uffff\1\60\6\uffff\12\60\1\uffff\12\60\1\uffff\2\60\2\uffff\1\u00a2\3\60\2\uffff\14\60\1\u00b2\5\60\1\u00b8\10\60\1\u00c1\1\uffff\2\60\1\u00c4\11\60\1\u00ce\2\60\1\uffff\1\u00d1\1\60\1\u00d4\2\60\1\uffff\10\60\1\uffff\1\60\1\u00e0\1\uffff\1\60\1\u00e2\5\60\1\u00e8\1\60\1\uffff\2\60\1\uffff\2\60\1\uffff\13\60\1\uffff\1\60\1\uffff\2\60\1\u00fc\2\60\1\uffff\2\60\1\u0101\5\60\1\u0108\4\60\1\u010d\5\60\1\uffff\1\60\1\u0114\2\60\1\uffff\3\60\1\u011a\2\60\1\uffff\4\60\1\uffff\1\u0121\1\u0122\4\60\1\uffff\1\u0127\4\60\1\uffff\4\60\1\u0130\1\60\2\uffff\1\u0132\1\u0133\1\u0134\1\60\1\uffff\3\60\1\u0139\2\60\1\u013d\1\u013e\1\uffff\1\60\3\uffff\2\60\1\u0142\1\60\1\uffff\3\60\2\uffff\1\u0147\1\u0148\1\60\1\uffff\1\u014a\1\u014b\2\60\2\uffff\1\60\2\uffff\2\60\1\u0151\2\60\1\uffff\1\60\1\u0155\1\60\1\uffff\1\u0157\1\uffff";
     static final String DFA14_eofS =
         "\u0158\uffff";
     static final String DFA14_minS =
-        "\1\0\1\142\1\157\1\60\2\uffff\1\164\1\141\1\165\1\145\1\141\1\162"+
-        "\1\60\1\150\1\uffff\1\156\1\76\1\162\1\146\1\165\1\157\1\141\7\uffff"+
-        "\1\52\2\uffff\1\141\1\uffff\1\164\1\130\1\101\2\uffff\2\0\1\52\2"+
-        "\uffff\1\163\2\164\1\171\1\uffff\1\144\1\151\1\164\1\145\3\uffff"+
-        "\1\141\1\60\1\164\1\142\1\156\1\146\1\156\1\141\1\164\1\151\1\uffff"+
-        "\1\157\1\uffff\1\60\2\uffff\1\151\2\60\2\164\1\141\1\156\2\60\1"+
-        "\156\13\uffff\1\154\1\uffff\1\102\6\uffff\1\164\1\151\1\162\1\156"+
-        "\2\145\1\164\1\162\1\156\1\164\1\uffff\1\141\1\147\1\143\1\151\1"+
-        "\144\1\156\1\162\1\164\1\151\1\164\1\uffff\1\147\1\145\2\uffff\1"+
-        "\60\1\151\1\162\1\144\2\uffff\1\144\1\163\1\157\1\156\1\145\1\150"+
-        "\1\162\1\157\1\151\1\143\1\154\1\156\1\60\1\171\1\164\1\145\1\144"+
-        "\1\162\1\60\1\156\1\154\1\163\1\171\1\120\1\143\1\151\1\147\1\60"+
-        "\1\uffff\1\157\1\144\1\60\1\141\1\145\1\157\1\164\3\141\1\156\1"+
-        "\142\1\60\1\103\1\144\1\uffff\1\60\1\144\1\60\1\162\1\141\1\uffff"+
-        "\2\145\1\151\1\120\1\157\1\145\1\141\1\145\1\uffff\1\156\1\60\1"+
-        "\uffff\1\164\1\60\1\154\1\145\1\154\1\162\1\143\1\60\1\165\1\uffff"+
-        "\1\157\1\163\1\uffff\1\162\1\141\1\uffff\1\151\1\160\1\144\1\162"+
-        "\1\164\1\157\1\151\1\120\1\154\1\162\1\141\1\uffff\1\157\1\uffff"+
-        "\1\145\1\147\1\60\1\141\1\164\1\uffff\1\164\1\155\1\60\1\151\1\143"+
-        "\1\166\1\150\1\123\1\60\2\151\1\156\1\157\1\60\1\163\1\154\1\162"+
-        "\1\141\1\145\1\uffff\1\143\1\60\1\145\1\160\1\uffff\1\166\1\150"+
-        "\1\145\1\60\1\164\1\162\1\uffff\1\157\1\156\1\164\1\151\1\uffff"+
-        "\2\60\1\171\1\156\1\162\1\164\1\uffff\1\60\1\157\1\145\1\151\1\156"+
-        "\1\uffff\2\141\1\156\1\164\1\60\1\156\2\uffff\3\60\1\145\1\uffff"+
-        "\3\156\1\60\1\164\1\156\2\60\1\uffff\1\164\3\uffff\1\162\1\145\1"+
-        "\60\1\145\1\uffff\1\145\1\163\1\157\2\uffff\2\60\1\156\1\uffff\2"+
-        "\60\2\151\2\uffff\1\164\2\uffff\1\164\1\156\1\60\1\151\1\164\1\uffff"+
-        "\1\157\1\60\1\156\1\uffff\1\60\1\uffff";
+        "\1\0\1\142\1\157\1\60\2\uffff\1\164\1\141\1\165\1\145\1\141\1\162\1\60\1\150\1\uffff\1\156\1\76\1\162\1\146\1\165\1\157\1\141\7\uffff\1\52\2\uffff\1\141\1\uffff\1\164\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\163\2\164\1\171\1\uffff\1\144\1\151\1\164\1\145\3\uffff\1\141\1\60\1\164\1\142\1\156\1\146\1\156\1\141\1\164\1\151\1\uffff\1\157\1\uffff\1\60\2\uffff\1\151\2\60\2\164\1\141\1\156\2\60\1\156\13\uffff\1\154\1\uffff\1\102\6\uffff\1\164\1\151\1\162\1\156\2\145\1\164\1\162\1\156\1\164\1\uffff\1\141\1\147\1\143\1\151\1\144\1\156\1\162\1\164\1\151\1\164\1\uffff\1\147\1\145\2\uffff\1\60\1\151\1\162\1\144\2\uffff\1\144\1\163\1\157\1\156\1\145\1\150\1\162\1\157\1\151\1\143\1\154\1\156\1\60\1\171\1\164\1\145\1\144\1\162\1\60\1\156\1\154\1\163\1\171\1\120\1\143\1\151\1\147\1\60\1\uffff\1\157\1\144\1\60\1\141\1\145\1\157\1\164\3\141\1\156\1\142\1\60\1\103\1\144\1\uffff\1\60\1\144\1\60\1\162\1\141\1\uffff\2\145\1\151\1\120\1\157\1\145\1\141\1\145\1\uffff\1\156\1\60\1\uffff\1\164\1\60\1\154\1\145\1\154\1\162\1\143\1\60\1\165\1\uffff\1\157\1\163\1\uffff\1\162\1\141\1\uffff\1\151\1\160\1\144\1\162\1\164\1\157\1\151\1\120\1\154\1\162\1\141\1\uffff\1\157\1\uffff\1\145\1\147\1\60\1\141\1\164\1\uffff\1\164\1\155\1\60\1\151\1\143\1\166\1\150\1\123\1\60\2\151\1\156\1\157\1\60\1\163\1\154\1\162\1\141\1\145\1\uffff\1\143\1\60\1\145\1\160\1\uffff\1\166\1\150\1\145\1\60\1\164\1\162\1\uffff\1\157\1\156\1\164\1\151\1\uffff\2\60\1\171\1\156\1\162\1\164\1\uffff\1\60\1\157\1\145\1\151\1\156\1\uffff\2\141\1\156\1\164\1\60\1\156\2\uffff\3\60\1\145\1\uffff\3\156\1\60\1\164\1\156\2\60\1\uffff\1\164\3\uffff\1\162\1\145\1\60\1\145\1\uffff\1\145\1\163\1\157\2\uffff\2\60\1\156\1\uffff\2\60\2\151\2\uffff\1\164\2\uffff\1\164\1\156\1\60\1\151\1\164\1\uffff\1\157\1\60\1\156\1\uffff\1\60\1\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\164\1\157\1\172\2\uffff\1\164\1\157\1\171\1\145\1\141"+
-        "\1\162\1\172\1\150\1\uffff\1\156\1\76\1\162\2\165\1\160\1\171\7"+
-        "\uffff\1\52\2\uffff\1\141\1\uffff\1\164\1\170\1\172\2\uffff\2\uffff"+
-        "\1\57\2\uffff\1\163\2\164\1\171\1\uffff\1\144\2\164\1\145\3\uffff"+
-        "\1\141\1\172\1\164\1\142\1\156\1\146\1\156\1\141\1\164\1\151\1\uffff"+
-        "\1\157\1\uffff\1\172\2\uffff\1\165\2\172\2\164\1\141\1\156\2\172"+
-        "\1\156\13\uffff\1\154\1\uffff\1\122\6\uffff\1\164\1\151\1\162\1"+
-        "\156\2\145\1\164\1\162\1\156\1\164\1\uffff\1\141\1\147\1\143\1\151"+
-        "\1\144\1\156\1\162\1\164\1\151\1\164\1\uffff\1\147\1\145\2\uffff"+
-        "\1\172\1\151\1\162\1\144\2\uffff\1\144\1\163\1\157\1\156\1\145\1"+
-        "\150\1\162\1\157\1\151\1\143\1\154\1\156\1\172\1\171\1\164\1\145"+
-        "\1\144\1\162\1\172\1\156\1\154\1\163\1\171\1\120\1\143\1\151\1\147"+
-        "\1\172\1\uffff\1\157\1\144\1\172\1\141\1\145\1\157\1\164\3\141\1"+
-        "\156\1\142\1\172\1\103\1\144\1\uffff\1\172\1\144\1\172\1\162\1\141"+
-        "\1\uffff\2\145\1\151\1\120\1\157\1\145\1\141\1\145\1\uffff\1\156"+
-        "\1\172\1\uffff\1\164\1\172\1\154\1\145\1\154\1\162\1\143\1\172\1"+
-        "\165\1\uffff\1\157\1\163\1\uffff\1\162\1\141\1\uffff\1\151\1\160"+
-        "\1\144\1\162\1\164\1\157\1\151\1\120\1\154\1\162\1\141\1\uffff\1"+
-        "\157\1\uffff\1\145\1\147\1\172\1\141\1\164\1\uffff\1\164\1\155\1"+
-        "\172\1\151\1\143\1\166\1\150\1\124\1\172\2\151\1\156\1\157\1\172"+
-        "\1\163\1\154\1\162\1\141\1\145\1\uffff\1\143\1\172\1\145\1\160\1"+
-        "\uffff\1\166\1\150\1\145\1\172\1\164\1\162\1\uffff\1\157\1\156\1"+
-        "\164\1\151\1\uffff\2\172\1\171\1\156\1\162\1\164\1\uffff\1\172\1"+
-        "\157\1\145\1\151\1\156\1\uffff\2\141\1\156\1\164\1\172\1\156\2\uffff"+
-        "\3\172\1\145\1\uffff\3\156\1\172\1\164\1\156\2\172\1\uffff\1\164"+
-        "\3\uffff\1\162\1\145\1\172\1\145\1\uffff\1\145\1\163\1\157\2\uffff"+
-        "\2\172\1\156\1\uffff\2\172\2\151\2\uffff\1\164\2\uffff\1\164\1\156"+
-        "\1\172\1\151\1\164\1\uffff\1\157\1\172\1\156\1\uffff\1\172\1\uffff";
+        "\1\uffff\1\164\1\157\1\172\2\uffff\1\164\1\157\1\171\1\145\1\141\1\162\1\172\1\150\1\uffff\1\156\1\76\1\162\2\165\1\160\1\171\7\uffff\1\52\2\uffff\1\141\1\uffff\1\164\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\2\164\1\171\1\uffff\1\144\2\164\1\145\3\uffff\1\141\1\172\1\164\1\142\1\156\1\146\1\156\1\141\1\164\1\151\1\uffff\1\157\1\uffff\1\172\2\uffff\1\165\2\172\2\164\1\141\1\156\2\172\1\156\13\uffff\1\154\1\uffff\1\122\6\uffff\1\164\1\151\1\162\1\156\2\145\1\164\1\162\1\156\1\164\1\uffff\1\141\1\147\1\143\1\151\1\144\1\156\1\162\1\164\1\151\1\164\1\uffff\1\147\1\145\2\uffff\1\172\1\151\1\162\1\144\2\uffff\1\144\1\163\1\157\1\156\1\145\1\150\1\162\1\157\1\151\1\143\1\154\1\156\1\172\1\171\1\164\1\145\1\144\1\162\1\172\1\156\1\154\1\163\1\171\1\120\1\143\1\151\1\147\1\172\1\uffff\1\157\1\144\1\172\1\141\1\145\1\157\1\164\3\141\1\156\1\142\1\172\1\103\1\144\1\uffff\1\172\1\144\1\172\1\162\1\141\1\uffff\2\145\1\151\1\120\1\157\1\145\1\141\1\145\1\uffff\1\156\1\172\1\uffff\1\164\1\172\1\154\1\145\1\154\1\162\1\143\1\172\1\165\1\uffff\1\157\1\163\1\uffff\1\162\1\141\1\uffff\1\151\1\160\1\144\1\162\1\164\1\157\1\151\1\120\1\154\1\162\1\141\1\uffff\1\157\1\uffff\1\145\1\147\1\172\1\141\1\164\1\uffff\1\164\1\155\1\172\1\151\1\143\1\166\1\150\1\124\1\172\2\151\1\156\1\157\1\172\1\163\1\154\1\162\1\141\1\145\1\uffff\1\143\1\172\1\145\1\160\1\uffff\1\166\1\150\1\145\1\172\1\164\1\162\1\uffff\1\157\1\156\1\164\1\151\1\uffff\2\172\1\171\1\156\1\162\1\164\1\uffff\1\172\1\157\1\145\1\151\1\156\1\uffff\2\141\1\156\1\164\1\172\1\156\2\uffff\3\172\1\145\1\uffff\3\156\1\172\1\164\1\156\2\172\1\uffff\1\164\3\uffff\1\162\1\145\1\172\1\145\1\uffff\1\145\1\163\1\157\2\uffff\2\172\1\156\1\uffff\2\172\2\151\2\uffff\1\164\2\uffff\1\164\1\156\1\172\1\151\1\164\1\uffff\1\157\1\172\1\156\1\uffff\1\172\1\uffff";
     static final String DFA14_acceptS =
-        "\4\uffff\1\4\1\5\10\uffff\1\23\7\uffff\1\37\1\40\1\41\1\43\1\44"+
-        "\1\45\1\47\1\uffff\1\54\1\55\1\uffff\1\60\3\uffff\1\76\1\77\3\uffff"+
-        "\1\103\1\104\4\uffff\1\76\4\uffff\1\63\1\4\1\5\12\uffff\1\64\1\uffff"+
-        "\1\23\1\uffff\1\25\1\61\12\uffff\1\37\1\40\1\41\1\43\1\44\1\45\1"+
-        "\47\1\53\1\62\1\54\1\55\1\uffff\1\60\1\uffff\1\75\1\77\1\100\1\101"+
-        "\1\102\1\103\12\uffff\1\12\12\uffff\1\42\2\uffff\1\30\1\35\4\uffff"+
-        "\1\36\1\34\34\uffff\1\46\17\uffff\1\11\5\uffff\1\70\10\uffff\1\57"+
-        "\2\uffff\1\32\11\uffff\1\67\2\uffff\1\10\2\uffff\1\7\13\uffff\1"+
-        "\31\1\uffff\1\56\5\uffff\1\26\23\uffff\1\73\4\uffff\1\3\6\uffff"+
-        "\1\15\4\uffff\1\24\6\uffff\1\1\5\uffff\1\13\6\uffff\1\27\1\50\4"+
-        "\uffff\1\52\10\uffff\1\20\1\uffff\1\51\1\71\1\72\4\uffff\1\66\3"+
-        "\uffff\1\22\1\17\3\uffff\1\65\4\uffff\1\21\1\74\1\uffff\1\6\1\14"+
-        "\5\uffff\1\2\3\uffff\1\16\1\uffff\1\33";
+        "\4\uffff\1\4\1\5\10\uffff\1\23\7\uffff\1\37\1\40\1\41\1\43\1\44\1\45\1\47\1\uffff\1\54\1\55\1\uffff\1\60\3\uffff\1\76\1\77\3\uffff\1\103\1\104\4\uffff\1\76\4\uffff\1\63\1\4\1\5\12\uffff\1\64\1\uffff\1\23\1\uffff\1\25\1\61\12\uffff\1\37\1\40\1\41\1\43\1\44\1\45\1\47\1\53\1\62\1\54\1\55\1\uffff\1\60\1\uffff\1\75\1\77\1\100\1\101\1\102\1\103\12\uffff\1\12\12\uffff\1\42\2\uffff\1\30\1\35\4\uffff\1\36\1\34\34\uffff\1\46\17\uffff\1\11\5\uffff\1\70\10\uffff\1\57\2\uffff\1\32\11\uffff\1\67\2\uffff\1\10\2\uffff\1\7\13\uffff\1\31\1\uffff\1\56\5\uffff\1\26\23\uffff\1\73\4\uffff\1\3\6\uffff\1\15\4\uffff\1\24\6\uffff\1\1\5\uffff\1\13\6\uffff\1\27\1\50\4\uffff\1\52\10\uffff\1\20\1\uffff\1\51\1\71\1\72\4\uffff\1\66\3\uffff\1\22\1\17\3\uffff\1\65\4\uffff\1\21\1\74\1\uffff\1\6\1\14\5\uffff\1\2\3\uffff\1\16\1\uffff\1\33";
     static final String DFA14_specialS =
         "\1\0\46\uffff\1\1\1\2\u012f\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\53\2\52\2\53\1\52\22\53\1\52\1\53\1\47\4\53\1\50\1\31\1"+
-            "\33\1\53\1\41\1\32\1\20\1\35\1\51\1\43\11\46\1\16\1\53\1\26"+
-            "\1\34\1\30\2\53\2\45\1\15\1\45\1\14\7\45\1\2\4\45\1\11\1\6\1"+
-            "\13\6\45\1\36\1\53\1\37\1\44\1\45\1\53\1\1\1\45\1\24\1\7\1\3"+
-            "\1\40\1\23\1\12\1\17\3\45\1\25\1\45\1\22\1\42\2\45\1\10\1\21"+
-            "\6\45\1\4\1\27\1\5\uff82\53",
+            "\11\53\2\52\2\53\1\52\22\53\1\52\1\53\1\47\4\53\1\50\1\31\1\33\1\53\1\41\1\32\1\20\1\35\1\51\1\43\11\46\1\16\1\53\1\26\1\34\1\30\2\53\2\45\1\15\1\45\1\14\7\45\1\2\4\45\1\11\1\6\1\13\6\45\1\36\1\53\1\37\1\44\1\45\1\53\1\1\1\45\1\24\1\7\1\3\1\40\1\23\1\12\1\17\3\45\1\25\1\45\1\22\1\42\2\45\1\10\1\21\6\45\1\4\1\27\1\5\uff82\53",
             "\1\54\1\55\17\uffff\1\57\1\56",
             "\1\61",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\63\7\60"+
-            "\1\64\1\60\1\62\2\60",
+            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\63\7\60\1\64\1\60\1\62\2\60",
             "",
             "",
             "\1\70",
@@ -2540,8 +2452,7 @@ public class InternalFSMLexer extends Lexer {
             "\1\75",
             "\1\76",
             "\1\77",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\100\11\60"+
-            "\1\101\2\60",
+            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\100\11\60\1\101\2\60",
             "\1\103",
             "",
             "\1\105",
@@ -2710,8 +2621,7 @@ public class InternalFSMLexer extends Lexer {
             "",
             "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
             "\1\u00d2",
-            "\12\60\7\uffff\14\60\1\u00d3\15\60\4\uffff\1\60\1\uffff\32"+
-            "\60",
+            "\12\60\7\uffff\14\60\1\u00d3\15\60\4\uffff\1\60\1\uffff\32\60",
             "\1\u00d5",
             "\1\u00d6",
             "",
@@ -2832,8 +2742,7 @@ public class InternalFSMLexer extends Lexer {
             "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
             "\1\u013a",
             "\1\u013b",
-            "\12\60\7\uffff\17\60\1\u013c\12\60\4\uffff\1\60\1\uffff\32"+
-            "\60",
+            "\12\60\7\uffff\17\60\1\u013c\12\60\4\uffff\1\60\1\uffff\32\60",
             "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
             "",
             "\1\u013f",
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMParser.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMParser.java
index 2996e6b5a..7e60b3277 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMParser.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSMParser.java
@@ -108,7 +108,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalFSMParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g"; }
+    public String getGrammarFileName() { return "InternalFSM.g"; }
 
 
 
@@ -133,7 +133,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFSMModel"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:68:1: entryRuleFSMModel returns [EObject current=null] : iv_ruleFSMModel= ruleFSMModel EOF ;
+    // InternalFSM.g:68:1: entryRuleFSMModel returns [EObject current=null] : iv_ruleFSMModel= ruleFSMModel EOF ;
     public final EObject entryRuleFSMModel() throws RecognitionException {
         EObject current = null;
 
@@ -141,17 +141,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:69:2: (iv_ruleFSMModel= ruleFSMModel EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:70:2: iv_ruleFSMModel= ruleFSMModel EOF
+            // InternalFSM.g:69:2: (iv_ruleFSMModel= ruleFSMModel EOF )
+            // InternalFSM.g:70:2: iv_ruleFSMModel= ruleFSMModel EOF
             {
              newCompositeNode(grammarAccess.getFSMModelRule()); 
-            pushFollow(FOLLOW_ruleFSMModel_in_entryRuleFSMModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleFSMModel=ruleFSMModel();
 
             state._fsp--;
 
              current =iv_ruleFSMModel; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFSMModel85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -169,7 +169,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFSMModel"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:77:1: ruleFSMModel returns [EObject current=null] : ( (lv_components_0_0= ruleModelComponent ) )* ;
+    // InternalFSM.g:77:1: ruleFSMModel returns [EObject current=null] : ( (lv_components_0_0= ruleModelComponent ) )* ;
     public final EObject ruleFSMModel() throws RecognitionException {
         EObject current = null;
 
@@ -179,10 +179,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:80:28: ( ( (lv_components_0_0= ruleModelComponent ) )* )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:81:1: ( (lv_components_0_0= ruleModelComponent ) )*
+            // InternalFSM.g:80:28: ( ( (lv_components_0_0= ruleModelComponent ) )* )
+            // InternalFSM.g:81:1: ( (lv_components_0_0= ruleModelComponent ) )*
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:81:1: ( (lv_components_0_0= ruleModelComponent ) )*
+            // InternalFSM.g:81:1: ( (lv_components_0_0= ruleModelComponent ) )*
             loop1:
             do {
                 int alt1=2;
@@ -195,15 +195,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:82:1: (lv_components_0_0= ruleModelComponent )
+            	    // InternalFSM.g:82:1: (lv_components_0_0= ruleModelComponent )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:82:1: (lv_components_0_0= ruleModelComponent )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:83:3: lv_components_0_0= ruleModelComponent
+            	    // InternalFSM.g:82:1: (lv_components_0_0= ruleModelComponent )
+            	    // InternalFSM.g:83:3: lv_components_0_0= ruleModelComponent
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getFSMModelAccess().getComponentsModelComponentParserRuleCall_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleModelComponent_in_ruleFSMModel130);
+            	    pushFollow(FOLLOW_3);
             	    lv_components_0_0=ruleModelComponent();
 
             	    state._fsp--;
@@ -216,7 +216,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"components",
             	            		lv_components_0_0, 
-            	            		"ModelComponent");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ModelComponent");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -249,7 +249,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleModelComponent"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:107:1: entryRuleModelComponent returns [EObject current=null] : iv_ruleModelComponent= ruleModelComponent EOF ;
+    // InternalFSM.g:107:1: entryRuleModelComponent returns [EObject current=null] : iv_ruleModelComponent= ruleModelComponent EOF ;
     public final EObject entryRuleModelComponent() throws RecognitionException {
         EObject current = null;
 
@@ -257,17 +257,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:108:2: (iv_ruleModelComponent= ruleModelComponent EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:109:2: iv_ruleModelComponent= ruleModelComponent EOF
+            // InternalFSM.g:108:2: (iv_ruleModelComponent= ruleModelComponent EOF )
+            // InternalFSM.g:109:2: iv_ruleModelComponent= ruleModelComponent EOF
             {
              newCompositeNode(grammarAccess.getModelComponentRule()); 
-            pushFollow(FOLLOW_ruleModelComponent_in_entryRuleModelComponent166);
+            pushFollow(FOLLOW_1);
             iv_ruleModelComponent=ruleModelComponent();
 
             state._fsp--;
 
              current =iv_ruleModelComponent; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModelComponent176); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -285,7 +285,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleModelComponent"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:116:1: ruleModelComponent returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) ) ;
+    // InternalFSM.g:116:1: ruleModelComponent returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) ) ;
     public final EObject ruleModelComponent() throws RecognitionException {
         EObject current = null;
 
@@ -301,67 +301,67 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:119:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:120:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) )
+            // InternalFSM.g:119:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) ) )
+            // InternalFSM.g:120:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:120:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:120:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) )
+            // InternalFSM.g:120:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) ) )
+            // InternalFSM.g:120:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ModelComponent' ( (lv_componentName_4_0= RULE_ID ) ) (otherlv_5= 'extends' ( ( ruleFQN ) ) )? ( (lv_stateMachine_7_0= ruleStateMachine ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:120:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:122:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
+            // InternalFSM.g:120:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) )
+            // InternalFSM.g:122:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:122:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:123:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
+            // InternalFSM.g:122:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
+            // InternalFSM.g:123:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
             {
              
             	  getUnorderedGroupHelper().enter(grammarAccess.getModelComponentAccess().getUnorderedGroup_0());
             	
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:126:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:127:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
+            // InternalFSM.g:126:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
+            // InternalFSM.g:127:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:127:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
+            // InternalFSM.g:127:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
             loop2:
             do {
                 int alt2=3;
                 int LA2_0 = input.LA(1);
 
-                if ( LA2_0 ==12 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA2_0 == 12 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
                     alt2=1;
                 }
-                else if ( LA2_0 >=64 && LA2_0<=67 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
+                else if ( LA2_0 >= 64 && LA2_0 <= 67 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
                     alt2=2;
                 }
 
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:129:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
+            	    // InternalFSM.g:129:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:129:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:130:5: {...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
+            	    // InternalFSM.g:129:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
+            	    // InternalFSM.g:130:5: {...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
             	        throw new FailedPredicateException(input, "ruleModelComponent", "getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:130:111: ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:131:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
+            	    // InternalFSM.g:130:111: ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
+            	    // InternalFSM.g:131:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0);
             	    	 				
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:134:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:134:7: {...}? => ( (lv_abstract_1_0= 'abstract' ) )
+            	    // InternalFSM.g:134:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
+            	    // InternalFSM.g:134:7: {...}? => ( (lv_abstract_1_0= 'abstract' ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleModelComponent", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:134:16: ( (lv_abstract_1_0= 'abstract' ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:135:1: (lv_abstract_1_0= 'abstract' )
+            	    // InternalFSM.g:134:16: ( (lv_abstract_1_0= 'abstract' ) )
+            	    // InternalFSM.g:135:1: (lv_abstract_1_0= 'abstract' )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:135:1: (lv_abstract_1_0= 'abstract' )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:136:3: lv_abstract_1_0= 'abstract'
+            	    // InternalFSM.g:135:1: (lv_abstract_1_0= 'abstract' )
+            	    // InternalFSM.g:136:3: lv_abstract_1_0= 'abstract'
             	    {
-            	    lv_abstract_1_0=(Token)match(input,12,FOLLOW_12_in_ruleModelComponent264); 
+            	    lv_abstract_1_0=(Token)match(input,12,FOLLOW_4); 
 
             	            newLeafNode(lv_abstract_1_0, grammarAccess.getModelComponentAccess().getAbstractAbstractKeyword_0_0_0());
             	        
@@ -393,36 +393,36 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:156:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
+            	    // InternalFSM.g:156:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:156:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:157:5: {...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
+            	    // InternalFSM.g:156:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
+            	    // InternalFSM.g:157:5: {...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
             	        throw new FailedPredicateException(input, "ruleModelComponent", "getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:157:111: ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:158:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
+            	    // InternalFSM.g:157:111: ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
+            	    // InternalFSM.g:158:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1);
             	    	 				
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:161:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:161:7: {...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) )
+            	    // InternalFSM.g:161:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
+            	    // InternalFSM.g:161:7: {...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleModelComponent", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:161:16: ( (lv_commType_2_0= ruleComponentCommunicationType ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:162:1: (lv_commType_2_0= ruleComponentCommunicationType )
+            	    // InternalFSM.g:161:16: ( (lv_commType_2_0= ruleComponentCommunicationType ) )
+            	    // InternalFSM.g:162:1: (lv_commType_2_0= ruleComponentCommunicationType )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:162:1: (lv_commType_2_0= ruleComponentCommunicationType )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:163:3: lv_commType_2_0= ruleComponentCommunicationType
+            	    // InternalFSM.g:162:1: (lv_commType_2_0= ruleComponentCommunicationType )
+            	    // InternalFSM.g:163:3: lv_commType_2_0= ruleComponentCommunicationType
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getModelComponentAccess().getCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleComponentCommunicationType_in_ruleModelComponent352);
+            	    pushFollow(FOLLOW_4);
             	    lv_commType_2_0=ruleComponentCommunicationType();
 
             	    state._fsp--;
@@ -435,7 +435,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"commType",
             	            		lv_commType_2_0, 
-            	            		"ComponentCommunicationType");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ComponentCommunicationType");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -477,17 +477,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleModelComponent404); 
+            otherlv_3=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getModelComponentAccess().getModelComponentKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:197:1: ( (lv_componentName_4_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:198:1: (lv_componentName_4_0= RULE_ID )
+            // InternalFSM.g:197:1: ( (lv_componentName_4_0= RULE_ID ) )
+            // InternalFSM.g:198:1: (lv_componentName_4_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:198:1: (lv_componentName_4_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:199:3: lv_componentName_4_0= RULE_ID
+            // InternalFSM.g:198:1: (lv_componentName_4_0= RULE_ID )
+            // InternalFSM.g:199:3: lv_componentName_4_0= RULE_ID
             {
-            lv_componentName_4_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleModelComponent421); 
+            lv_componentName_4_0=(Token)match(input,RULE_ID,FOLLOW_6); 
 
             			newLeafNode(lv_componentName_4_0, grammarAccess.getModelComponentAccess().getComponentNameIDTerminalRuleCall_2_0()); 
             		
@@ -499,7 +499,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"componentName",
                     		lv_componentName_4_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -507,7 +507,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:215:2: (otherlv_5= 'extends' ( ( ruleFQN ) ) )?
+            // InternalFSM.g:215:2: (otherlv_5= 'extends' ( ( ruleFQN ) ) )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -516,17 +516,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:215:4: otherlv_5= 'extends' ( ( ruleFQN ) )
+                    // InternalFSM.g:215:4: otherlv_5= 'extends' ( ( ruleFQN ) )
                     {
-                    otherlv_5=(Token)match(input,14,FOLLOW_14_in_ruleModelComponent439); 
+                    otherlv_5=(Token)match(input,14,FOLLOW_5); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getModelComponentAccess().getExtendsKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:219:1: ( ( ruleFQN ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:220:1: ( ruleFQN )
+                    // InternalFSM.g:219:1: ( ( ruleFQN ) )
+                    // InternalFSM.g:220:1: ( ruleFQN )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:220:1: ( ruleFQN )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:221:3: ruleFQN
+                    // InternalFSM.g:220:1: ( ruleFQN )
+                    // InternalFSM.g:221:3: ruleFQN
                     {
 
                     			if (current==null) {
@@ -536,7 +536,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                      
                     	        newCompositeNode(grammarAccess.getModelComponentAccess().getBaseModelComponentCrossReference_3_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleFQN_in_ruleModelComponent462);
+                    pushFollow(FOLLOW_6);
                     ruleFQN();
 
                     state._fsp--;
@@ -556,16 +556,16 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:234:4: ( (lv_stateMachine_7_0= ruleStateMachine ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:235:1: (lv_stateMachine_7_0= ruleStateMachine )
+            // InternalFSM.g:234:4: ( (lv_stateMachine_7_0= ruleStateMachine ) )
+            // InternalFSM.g:235:1: (lv_stateMachine_7_0= ruleStateMachine )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:235:1: (lv_stateMachine_7_0= ruleStateMachine )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:236:3: lv_stateMachine_7_0= ruleStateMachine
+            // InternalFSM.g:235:1: (lv_stateMachine_7_0= ruleStateMachine )
+            // InternalFSM.g:236:3: lv_stateMachine_7_0= ruleStateMachine
             {
              
             	        newCompositeNode(grammarAccess.getModelComponentAccess().getStateMachineStateMachineParserRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleStateMachine_in_ruleModelComponent485);
+            pushFollow(FOLLOW_2);
             lv_stateMachine_7_0=ruleStateMachine();
 
             state._fsp--;
@@ -578,7 +578,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"stateMachine",
                     		lv_stateMachine_7_0, 
-                    		"StateMachine");
+                    		"org.eclipse.etrice.core.fsm.FSM.StateMachine");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -608,7 +608,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateGraphNode"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:260:1: entryRuleStateGraphNode returns [EObject current=null] : iv_ruleStateGraphNode= ruleStateGraphNode EOF ;
+    // InternalFSM.g:260:1: entryRuleStateGraphNode returns [EObject current=null] : iv_ruleStateGraphNode= ruleStateGraphNode EOF ;
     public final EObject entryRuleStateGraphNode() throws RecognitionException {
         EObject current = null;
 
@@ -616,17 +616,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:261:2: (iv_ruleStateGraphNode= ruleStateGraphNode EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:262:2: iv_ruleStateGraphNode= ruleStateGraphNode EOF
+            // InternalFSM.g:261:2: (iv_ruleStateGraphNode= ruleStateGraphNode EOF )
+            // InternalFSM.g:262:2: iv_ruleStateGraphNode= ruleStateGraphNode EOF
             {
              newCompositeNode(grammarAccess.getStateGraphNodeRule()); 
-            pushFollow(FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode521);
+            pushFollow(FOLLOW_1);
             iv_ruleStateGraphNode=ruleStateGraphNode();
 
             state._fsp--;
 
              current =iv_ruleStateGraphNode; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraphNode531); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -644,7 +644,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateGraphNode"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:269:1: ruleStateGraphNode returns [EObject current=null] : (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) ;
+    // InternalFSM.g:269:1: ruleStateGraphNode returns [EObject current=null] : (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) ;
     public final EObject ruleStateGraphNode() throws RecognitionException {
         EObject current = null;
 
@@ -658,10 +658,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:272:28: ( (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:273:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
+            // InternalFSM.g:272:28: ( (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) )
+            // InternalFSM.g:273:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:273:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
+            // InternalFSM.g:273:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
             int alt4=3;
             switch ( input.LA(1) ) {
             case 18:
@@ -692,12 +692,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:274:5: this_State_0= ruleState
+                    // InternalFSM.g:274:5: this_State_0= ruleState
                     {
                      
                             newCompositeNode(grammarAccess.getStateGraphNodeAccess().getStateParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleState_in_ruleStateGraphNode578);
+                    pushFollow(FOLLOW_2);
                     this_State_0=ruleState();
 
                     state._fsp--;
@@ -710,12 +710,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:284:5: this_ChoicePoint_1= ruleChoicePoint
+                    // InternalFSM.g:284:5: this_ChoicePoint_1= ruleChoicePoint
                     {
                      
                             newCompositeNode(grammarAccess.getStateGraphNodeAccess().getChoicePointParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleChoicePoint_in_ruleStateGraphNode605);
+                    pushFollow(FOLLOW_2);
                     this_ChoicePoint_1=ruleChoicePoint();
 
                     state._fsp--;
@@ -728,12 +728,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:294:5: this_TrPoint_2= ruleTrPoint
+                    // InternalFSM.g:294:5: this_TrPoint_2= ruleTrPoint
                     {
                      
                             newCompositeNode(grammarAccess.getStateGraphNodeAccess().getTrPointParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleTrPoint_in_ruleStateGraphNode632);
+                    pushFollow(FOLLOW_2);
                     this_TrPoint_2=ruleTrPoint();
 
                     state._fsp--;
@@ -766,7 +766,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateGraph"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:312:1: entryRuleStateGraph returns [EObject current=null] : iv_ruleStateGraph= ruleStateGraph EOF ;
+    // InternalFSM.g:312:1: entryRuleStateGraph returns [EObject current=null] : iv_ruleStateGraph= ruleStateGraph EOF ;
     public final EObject entryRuleStateGraph() throws RecognitionException {
         EObject current = null;
 
@@ -774,17 +774,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:313:2: (iv_ruleStateGraph= ruleStateGraph EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:314:2: iv_ruleStateGraph= ruleStateGraph EOF
+            // InternalFSM.g:313:2: (iv_ruleStateGraph= ruleStateGraph EOF )
+            // InternalFSM.g:314:2: iv_ruleStateGraph= ruleStateGraph EOF
             {
              newCompositeNode(grammarAccess.getStateGraphRule()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_entryRuleStateGraph669);
+            pushFollow(FOLLOW_1);
             iv_ruleStateGraph=ruleStateGraph();
 
             state._fsp--;
 
              current =iv_ruleStateGraph; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraph679); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -802,7 +802,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateGraph"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:321:1: ruleStateGraph returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' ) ;
+    // InternalFSM.g:321:1: ruleStateGraph returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' ) ;
     public final EObject ruleStateGraph() throws RecognitionException {
         EObject current = null;
 
@@ -822,14 +822,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:324:28: ( ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:325:1: ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' )
+            // InternalFSM.g:324:28: ( ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' ) )
+            // InternalFSM.g:325:1: ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:325:1: ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:325:2: () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}'
+            // InternalFSM.g:325:1: ( () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}' )
+            // InternalFSM.g:325:2: () otherlv_1= '{' ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )* otherlv_7= '}'
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:325:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:326:5: 
+            // InternalFSM.g:325:2: ()
+            // InternalFSM.g:326:5: 
             {
 
                     current = forceCreateModelElement(
@@ -839,11 +839,11 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleStateGraph725); 
+            otherlv_1=(Token)match(input,15,FOLLOW_7); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getStateGraphAccess().getLeftCurlyBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:335:1: ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )*
+            // InternalFSM.g:335:1: ( ( (lv_states_2_0= ruleState ) ) | ( (lv_trPoints_3_0= ruleTrPoint ) ) | ( (lv_chPoints_4_0= ruleChoicePoint ) ) | ( (lv_transitions_5_0= ruleTransition ) ) | ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) ) )*
             loop5:
             do {
                 int alt5=6;
@@ -882,18 +882,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:335:2: ( (lv_states_2_0= ruleState ) )
+            	    // InternalFSM.g:335:2: ( (lv_states_2_0= ruleState ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:335:2: ( (lv_states_2_0= ruleState ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:336:1: (lv_states_2_0= ruleState )
+            	    // InternalFSM.g:335:2: ( (lv_states_2_0= ruleState ) )
+            	    // InternalFSM.g:336:1: (lv_states_2_0= ruleState )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:336:1: (lv_states_2_0= ruleState )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:337:3: lv_states_2_0= ruleState
+            	    // InternalFSM.g:336:1: (lv_states_2_0= ruleState )
+            	    // InternalFSM.g:337:3: lv_states_2_0= ruleState
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getStatesStateParserRuleCall_2_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleState_in_ruleStateGraph747);
+            	    pushFollow(FOLLOW_7);
             	    lv_states_2_0=ruleState();
 
             	    state._fsp--;
@@ -906,7 +906,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"states",
             	            		lv_states_2_0, 
-            	            		"State");
+            	            		"org.eclipse.etrice.core.fsm.FSM.State");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -919,18 +919,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:354:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
+            	    // InternalFSM.g:354:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:354:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:355:1: (lv_trPoints_3_0= ruleTrPoint )
+            	    // InternalFSM.g:354:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
+            	    // InternalFSM.g:355:1: (lv_trPoints_3_0= ruleTrPoint )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:355:1: (lv_trPoints_3_0= ruleTrPoint )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:356:3: lv_trPoints_3_0= ruleTrPoint
+            	    // InternalFSM.g:355:1: (lv_trPoints_3_0= ruleTrPoint )
+            	    // InternalFSM.g:356:3: lv_trPoints_3_0= ruleTrPoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getTrPointsTrPointParserRuleCall_2_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTrPoint_in_ruleStateGraph774);
+            	    pushFollow(FOLLOW_7);
             	    lv_trPoints_3_0=ruleTrPoint();
 
             	    state._fsp--;
@@ -943,7 +943,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"trPoints",
             	            		lv_trPoints_3_0, 
-            	            		"TrPoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -956,18 +956,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:373:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
+            	    // InternalFSM.g:373:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:373:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:374:1: (lv_chPoints_4_0= ruleChoicePoint )
+            	    // InternalFSM.g:373:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
+            	    // InternalFSM.g:374:1: (lv_chPoints_4_0= ruleChoicePoint )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:374:1: (lv_chPoints_4_0= ruleChoicePoint )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:375:3: lv_chPoints_4_0= ruleChoicePoint
+            	    // InternalFSM.g:374:1: (lv_chPoints_4_0= ruleChoicePoint )
+            	    // InternalFSM.g:375:3: lv_chPoints_4_0= ruleChoicePoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getChPointsChoicePointParserRuleCall_2_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleChoicePoint_in_ruleStateGraph801);
+            	    pushFollow(FOLLOW_7);
             	    lv_chPoints_4_0=ruleChoicePoint();
 
             	    state._fsp--;
@@ -980,7 +980,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"chPoints",
             	            		lv_chPoints_4_0, 
-            	            		"ChoicePoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -993,18 +993,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:392:6: ( (lv_transitions_5_0= ruleTransition ) )
+            	    // InternalFSM.g:392:6: ( (lv_transitions_5_0= ruleTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:392:6: ( (lv_transitions_5_0= ruleTransition ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:393:1: (lv_transitions_5_0= ruleTransition )
+            	    // InternalFSM.g:392:6: ( (lv_transitions_5_0= ruleTransition ) )
+            	    // InternalFSM.g:393:1: (lv_transitions_5_0= ruleTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:393:1: (lv_transitions_5_0= ruleTransition )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:394:3: lv_transitions_5_0= ruleTransition
+            	    // InternalFSM.g:393:1: (lv_transitions_5_0= ruleTransition )
+            	    // InternalFSM.g:394:3: lv_transitions_5_0= ruleTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getTransitionsTransitionParserRuleCall_2_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTransition_in_ruleStateGraph828);
+            	    pushFollow(FOLLOW_7);
             	    lv_transitions_5_0=ruleTransition();
 
             	    state._fsp--;
@@ -1017,7 +1017,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"transitions",
             	            		lv_transitions_5_0, 
-            	            		"Transition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.Transition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1030,18 +1030,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:411:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
+            	    // InternalFSM.g:411:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:411:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:412:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
+            	    // InternalFSM.g:411:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
+            	    // InternalFSM.g:412:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:412:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:413:3: lv_refinedTransitions_6_0= ruleRefinedTransition
+            	    // InternalFSM.g:412:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
+            	    // InternalFSM.g:413:3: lv_refinedTransitions_6_0= ruleRefinedTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_2_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleRefinedTransition_in_ruleStateGraph855);
+            	    pushFollow(FOLLOW_7);
             	    lv_refinedTransitions_6_0=ruleRefinedTransition();
 
             	    state._fsp--;
@@ -1054,7 +1054,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"refinedTransitions",
             	            		lv_refinedTransitions_6_0, 
-            	            		"RefinedTransition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1072,7 +1072,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_7=(Token)match(input,16,FOLLOW_16_in_ruleStateGraph869); 
+            otherlv_7=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getStateGraphAccess().getRightCurlyBracketKeyword_3());
                 
@@ -1097,7 +1097,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateMachine"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:441:1: entryRuleStateMachine returns [EObject current=null] : iv_ruleStateMachine= ruleStateMachine EOF ;
+    // InternalFSM.g:441:1: entryRuleStateMachine returns [EObject current=null] : iv_ruleStateMachine= ruleStateMachine EOF ;
     public final EObject entryRuleStateMachine() throws RecognitionException {
         EObject current = null;
 
@@ -1105,17 +1105,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:442:2: (iv_ruleStateMachine= ruleStateMachine EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:443:2: iv_ruleStateMachine= ruleStateMachine EOF
+            // InternalFSM.g:442:2: (iv_ruleStateMachine= ruleStateMachine EOF )
+            // InternalFSM.g:443:2: iv_ruleStateMachine= ruleStateMachine EOF
             {
              newCompositeNode(grammarAccess.getStateMachineRule()); 
-            pushFollow(FOLLOW_ruleStateMachine_in_entryRuleStateMachine905);
+            pushFollow(FOLLOW_1);
             iv_ruleStateMachine=ruleStateMachine();
 
             state._fsp--;
 
              current =iv_ruleStateMachine; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateMachine915); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1133,7 +1133,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateMachine"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:450:1: ruleStateMachine returns [EObject current=null] : ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' ) ;
+    // InternalFSM.g:450:1: ruleStateMachine returns [EObject current=null] : ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' ) ;
     public final EObject ruleStateMachine() throws RecognitionException {
         EObject current = null;
 
@@ -1154,14 +1154,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:453:28: ( ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:454:1: ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' )
+            // InternalFSM.g:453:28: ( ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' ) )
+            // InternalFSM.g:454:1: ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:454:1: ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:454:2: () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}'
+            // InternalFSM.g:454:1: ( () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}' )
+            // InternalFSM.g:454:2: () otherlv_1= 'StateMachine' otherlv_2= '{' ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )* otherlv_8= '}'
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:454:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:455:5: 
+            // InternalFSM.g:454:2: ()
+            // InternalFSM.g:455:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1171,15 +1171,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,17,FOLLOW_17_in_ruleStateMachine961); 
+            otherlv_1=(Token)match(input,17,FOLLOW_8); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getStateMachineAccess().getStateMachineKeyword_1());
                 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleStateMachine973); 
+            otherlv_2=(Token)match(input,15,FOLLOW_7); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getStateMachineAccess().getLeftCurlyBracketKeyword_2());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:468:1: ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )*
+            // InternalFSM.g:468:1: ( ( (lv_states_3_0= ruleState ) ) | ( (lv_trPoints_4_0= ruleTrPoint ) ) | ( (lv_chPoints_5_0= ruleChoicePoint ) ) | ( (lv_transitions_6_0= ruleTransition ) ) | ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) ) )*
             loop6:
             do {
                 int alt6=6;
@@ -1218,18 +1218,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt6) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:468:2: ( (lv_states_3_0= ruleState ) )
+            	    // InternalFSM.g:468:2: ( (lv_states_3_0= ruleState ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:468:2: ( (lv_states_3_0= ruleState ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:469:1: (lv_states_3_0= ruleState )
+            	    // InternalFSM.g:468:2: ( (lv_states_3_0= ruleState ) )
+            	    // InternalFSM.g:469:1: (lv_states_3_0= ruleState )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:469:1: (lv_states_3_0= ruleState )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:470:3: lv_states_3_0= ruleState
+            	    // InternalFSM.g:469:1: (lv_states_3_0= ruleState )
+            	    // InternalFSM.g:470:3: lv_states_3_0= ruleState
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getStatesStateParserRuleCall_3_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleState_in_ruleStateMachine995);
+            	    pushFollow(FOLLOW_7);
             	    lv_states_3_0=ruleState();
 
             	    state._fsp--;
@@ -1242,7 +1242,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"states",
             	            		lv_states_3_0, 
-            	            		"State");
+            	            		"org.eclipse.etrice.core.fsm.FSM.State");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1255,18 +1255,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:487:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
+            	    // InternalFSM.g:487:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:487:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:488:1: (lv_trPoints_4_0= ruleTrPoint )
+            	    // InternalFSM.g:487:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
+            	    // InternalFSM.g:488:1: (lv_trPoints_4_0= ruleTrPoint )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:488:1: (lv_trPoints_4_0= ruleTrPoint )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:489:3: lv_trPoints_4_0= ruleTrPoint
+            	    // InternalFSM.g:488:1: (lv_trPoints_4_0= ruleTrPoint )
+            	    // InternalFSM.g:489:3: lv_trPoints_4_0= ruleTrPoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getTrPointsTrPointParserRuleCall_3_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTrPoint_in_ruleStateMachine1022);
+            	    pushFollow(FOLLOW_7);
             	    lv_trPoints_4_0=ruleTrPoint();
 
             	    state._fsp--;
@@ -1279,7 +1279,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"trPoints",
             	            		lv_trPoints_4_0, 
-            	            		"TrPoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1292,18 +1292,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:506:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
+            	    // InternalFSM.g:506:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:506:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:507:1: (lv_chPoints_5_0= ruleChoicePoint )
+            	    // InternalFSM.g:506:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
+            	    // InternalFSM.g:507:1: (lv_chPoints_5_0= ruleChoicePoint )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:507:1: (lv_chPoints_5_0= ruleChoicePoint )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:508:3: lv_chPoints_5_0= ruleChoicePoint
+            	    // InternalFSM.g:507:1: (lv_chPoints_5_0= ruleChoicePoint )
+            	    // InternalFSM.g:508:3: lv_chPoints_5_0= ruleChoicePoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getChPointsChoicePointParserRuleCall_3_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleChoicePoint_in_ruleStateMachine1049);
+            	    pushFollow(FOLLOW_7);
             	    lv_chPoints_5_0=ruleChoicePoint();
 
             	    state._fsp--;
@@ -1316,7 +1316,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"chPoints",
             	            		lv_chPoints_5_0, 
-            	            		"ChoicePoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1329,18 +1329,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:525:6: ( (lv_transitions_6_0= ruleTransition ) )
+            	    // InternalFSM.g:525:6: ( (lv_transitions_6_0= ruleTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:525:6: ( (lv_transitions_6_0= ruleTransition ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:526:1: (lv_transitions_6_0= ruleTransition )
+            	    // InternalFSM.g:525:6: ( (lv_transitions_6_0= ruleTransition ) )
+            	    // InternalFSM.g:526:1: (lv_transitions_6_0= ruleTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:526:1: (lv_transitions_6_0= ruleTransition )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:527:3: lv_transitions_6_0= ruleTransition
+            	    // InternalFSM.g:526:1: (lv_transitions_6_0= ruleTransition )
+            	    // InternalFSM.g:527:3: lv_transitions_6_0= ruleTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getTransitionsTransitionParserRuleCall_3_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTransition_in_ruleStateMachine1076);
+            	    pushFollow(FOLLOW_7);
             	    lv_transitions_6_0=ruleTransition();
 
             	    state._fsp--;
@@ -1353,7 +1353,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"transitions",
             	            		lv_transitions_6_0, 
-            	            		"Transition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.Transition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1366,18 +1366,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:544:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
+            	    // InternalFSM.g:544:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:544:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:545:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
+            	    // InternalFSM.g:544:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
+            	    // InternalFSM.g:545:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:545:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:546:3: lv_refinedTransitions_7_0= ruleRefinedTransition
+            	    // InternalFSM.g:545:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
+            	    // InternalFSM.g:546:3: lv_refinedTransitions_7_0= ruleRefinedTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleRefinedTransition_in_ruleStateMachine1103);
+            	    pushFollow(FOLLOW_7);
             	    lv_refinedTransitions_7_0=ruleRefinedTransition();
 
             	    state._fsp--;
@@ -1390,7 +1390,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"refinedTransitions",
             	            		lv_refinedTransitions_7_0, 
-            	            		"RefinedTransition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1408,7 +1408,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_8=(Token)match(input,16,FOLLOW_16_in_ruleStateMachine1117); 
+            otherlv_8=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getStateMachineAccess().getRightCurlyBracketKeyword_4());
                 
@@ -1433,7 +1433,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleState"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:574:1: entryRuleState returns [EObject current=null] : iv_ruleState= ruleState EOF ;
+    // InternalFSM.g:574:1: entryRuleState returns [EObject current=null] : iv_ruleState= ruleState EOF ;
     public final EObject entryRuleState() throws RecognitionException {
         EObject current = null;
 
@@ -1441,17 +1441,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:575:2: (iv_ruleState= ruleState EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:576:2: iv_ruleState= ruleState EOF
+            // InternalFSM.g:575:2: (iv_ruleState= ruleState EOF )
+            // InternalFSM.g:576:2: iv_ruleState= ruleState EOF
             {
              newCompositeNode(grammarAccess.getStateRule()); 
-            pushFollow(FOLLOW_ruleState_in_entryRuleState1153);
+            pushFollow(FOLLOW_1);
             iv_ruleState=ruleState();
 
             state._fsp--;
 
              current =iv_ruleState; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleState1163); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1469,7 +1469,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleState"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:583:1: ruleState returns [EObject current=null] : (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) ;
+    // InternalFSM.g:583:1: ruleState returns [EObject current=null] : (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) ;
     public final EObject ruleState() throws RecognitionException {
         EObject current = null;
 
@@ -1481,10 +1481,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:586:28: ( (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:587:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
+            // InternalFSM.g:586:28: ( (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) )
+            // InternalFSM.g:587:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:587:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
+            // InternalFSM.g:587:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1502,12 +1502,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:588:5: this_SimpleState_0= ruleSimpleState
+                    // InternalFSM.g:588:5: this_SimpleState_0= ruleSimpleState
                     {
                      
                             newCompositeNode(grammarAccess.getStateAccess().getSimpleStateParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleState_in_ruleState1210);
+                    pushFollow(FOLLOW_2);
                     this_SimpleState_0=ruleSimpleState();
 
                     state._fsp--;
@@ -1520,12 +1520,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:598:5: this_RefinedState_1= ruleRefinedState
+                    // InternalFSM.g:598:5: this_RefinedState_1= ruleRefinedState
                     {
                      
                             newCompositeNode(grammarAccess.getStateAccess().getRefinedStateParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRefinedState_in_ruleState1237);
+                    pushFollow(FOLLOW_2);
                     this_RefinedState_1=ruleRefinedState();
 
                     state._fsp--;
@@ -1558,7 +1558,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleState"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:614:1: entryRuleSimpleState returns [EObject current=null] : iv_ruleSimpleState= ruleSimpleState EOF ;
+    // InternalFSM.g:614:1: entryRuleSimpleState returns [EObject current=null] : iv_ruleSimpleState= ruleSimpleState EOF ;
     public final EObject entryRuleSimpleState() throws RecognitionException {
         EObject current = null;
 
@@ -1566,17 +1566,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:615:2: (iv_ruleSimpleState= ruleSimpleState EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:616:2: iv_ruleSimpleState= ruleSimpleState EOF
+            // InternalFSM.g:615:2: (iv_ruleSimpleState= ruleSimpleState EOF )
+            // InternalFSM.g:616:2: iv_ruleSimpleState= ruleSimpleState EOF
             {
              newCompositeNode(grammarAccess.getSimpleStateRule()); 
-            pushFollow(FOLLOW_ruleSimpleState_in_entryRuleSimpleState1272);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleState=ruleSimpleState();
 
             state._fsp--;
 
              current =iv_ruleSimpleState; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleState1282); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1594,7 +1594,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleState"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:623:1: ruleSimpleState returns [EObject current=null] : (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? ) ;
+    // InternalFSM.g:623:1: ruleSimpleState returns [EObject current=null] : (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? ) ;
     public final EObject ruleSimpleState() throws RecognitionException {
         EObject current = null;
 
@@ -1620,23 +1620,23 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:626:28: ( (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:627:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? )
+            // InternalFSM.g:626:28: ( (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? ) )
+            // InternalFSM.g:627:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:627:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:627:3: otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )?
+            // InternalFSM.g:627:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )? )
+            // InternalFSM.g:627:3: otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )?
             {
-            otherlv_0=(Token)match(input,18,FOLLOW_18_in_ruleSimpleState1319); 
+            otherlv_0=(Token)match(input,18,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSimpleStateAccess().getStateKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:631:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:632:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:631:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalFSM.g:632:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:632:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:633:3: lv_name_1_0= RULE_ID
+            // InternalFSM.g:632:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:633:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleState1336); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSimpleStateAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -1648,7 +1648,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1656,7 +1656,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:649:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalFSM.g:649:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1665,15 +1665,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:650:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:650:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:650:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:651:3: lv_docu_2_0= ruleDocumentation
+                    // InternalFSM.g:650:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:651:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getSimpleStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleSimpleState1362);
+                    pushFollow(FOLLOW_10);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -1686,7 +1686,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -1698,7 +1698,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:667:3: (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )?
+            // InternalFSM.g:667:3: (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1707,13 +1707,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:667:5: otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}'
+                    // InternalFSM.g:667:5: otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}'
                     {
-                    otherlv_3=(Token)match(input,15,FOLLOW_15_in_ruleSimpleState1376); 
+                    otherlv_3=(Token)match(input,15,FOLLOW_11); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getSimpleStateAccess().getLeftCurlyBracketKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:671:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
+                    // InternalFSM.g:671:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1722,22 +1722,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:671:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
+                            // InternalFSM.g:671:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
                             {
-                            otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleSimpleState1389); 
+                            otherlv_4=(Token)match(input,19,FOLLOW_8); 
 
                                 	newLeafNode(otherlv_4, grammarAccess.getSimpleStateAccess().getEntryKeyword_3_1_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:675:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:676:1: (lv_entryCode_5_0= ruleDetailCode )
+                            // InternalFSM.g:675:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
+                            // InternalFSM.g:676:1: (lv_entryCode_5_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:676:1: (lv_entryCode_5_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:677:3: lv_entryCode_5_0= ruleDetailCode
+                            // InternalFSM.g:676:1: (lv_entryCode_5_0= ruleDetailCode )
+                            // InternalFSM.g:677:3: lv_entryCode_5_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getEntryCodeDetailCodeParserRuleCall_3_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleSimpleState1410);
+                            pushFollow(FOLLOW_12);
                             lv_entryCode_5_0=ruleDetailCode();
 
                             state._fsp--;
@@ -1750,7 +1750,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"entryCode",
                                     		lv_entryCode_5_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -1765,7 +1765,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:693:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
+                    // InternalFSM.g:693:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
                     int alt10=2;
                     int LA10_0 = input.LA(1);
 
@@ -1774,22 +1774,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt10) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:693:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
+                            // InternalFSM.g:693:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
                             {
-                            otherlv_6=(Token)match(input,20,FOLLOW_20_in_ruleSimpleState1425); 
+                            otherlv_6=(Token)match(input,20,FOLLOW_8); 
 
                                 	newLeafNode(otherlv_6, grammarAccess.getSimpleStateAccess().getExitKeyword_3_2_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:697:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:698:1: (lv_exitCode_7_0= ruleDetailCode )
+                            // InternalFSM.g:697:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
+                            // InternalFSM.g:698:1: (lv_exitCode_7_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:698:1: (lv_exitCode_7_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:699:3: lv_exitCode_7_0= ruleDetailCode
+                            // InternalFSM.g:698:1: (lv_exitCode_7_0= ruleDetailCode )
+                            // InternalFSM.g:699:3: lv_exitCode_7_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getExitCodeDetailCodeParserRuleCall_3_2_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleSimpleState1446);
+                            pushFollow(FOLLOW_13);
                             lv_exitCode_7_0=ruleDetailCode();
 
                             state._fsp--;
@@ -1802,7 +1802,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"exitCode",
                                     		lv_exitCode_7_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -1817,7 +1817,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:715:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
+                    // InternalFSM.g:715:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1826,22 +1826,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:715:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
+                            // InternalFSM.g:715:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
                             {
-                            otherlv_8=(Token)match(input,21,FOLLOW_21_in_ruleSimpleState1461); 
+                            otherlv_8=(Token)match(input,21,FOLLOW_8); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getSimpleStateAccess().getDoKeyword_3_3_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:719:1: ( (lv_doCode_9_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:720:1: (lv_doCode_9_0= ruleDetailCode )
+                            // InternalFSM.g:719:1: ( (lv_doCode_9_0= ruleDetailCode ) )
+                            // InternalFSM.g:720:1: (lv_doCode_9_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:720:1: (lv_doCode_9_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:721:3: lv_doCode_9_0= ruleDetailCode
+                            // InternalFSM.g:720:1: (lv_doCode_9_0= ruleDetailCode )
+                            // InternalFSM.g:721:3: lv_doCode_9_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getDoCodeDetailCodeParserRuleCall_3_3_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleSimpleState1482);
+                            pushFollow(FOLLOW_14);
                             lv_doCode_9_0=ruleDetailCode();
 
                             state._fsp--;
@@ -1854,7 +1854,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"doCode",
                                     		lv_doCode_9_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -1869,7 +1869,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:737:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
+                    // InternalFSM.g:737:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -1878,22 +1878,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:737:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
+                            // InternalFSM.g:737:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
                             {
-                            otherlv_10=(Token)match(input,22,FOLLOW_22_in_ruleSimpleState1497); 
+                            otherlv_10=(Token)match(input,22,FOLLOW_8); 
 
                                 	newLeafNode(otherlv_10, grammarAccess.getSimpleStateAccess().getSubgraphKeyword_3_4_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:741:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:742:1: (lv_subgraph_11_0= ruleStateGraph )
+                            // InternalFSM.g:741:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
+                            // InternalFSM.g:742:1: (lv_subgraph_11_0= ruleStateGraph )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:742:1: (lv_subgraph_11_0= ruleStateGraph )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:743:3: lv_subgraph_11_0= ruleStateGraph
+                            // InternalFSM.g:742:1: (lv_subgraph_11_0= ruleStateGraph )
+                            // InternalFSM.g:743:3: lv_subgraph_11_0= ruleStateGraph
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getSubgraphStateGraphParserRuleCall_3_4_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleStateGraph_in_ruleSimpleState1518);
+                            pushFollow(FOLLOW_15);
                             lv_subgraph_11_0=ruleStateGraph();
 
                             state._fsp--;
@@ -1906,7 +1906,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"subgraph",
                                     		lv_subgraph_11_0, 
-                                    		"StateGraph");
+                                    		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -1921,7 +1921,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_12=(Token)match(input,16,FOLLOW_16_in_ruleSimpleState1532); 
+                    otherlv_12=(Token)match(input,16,FOLLOW_2); 
 
                         	newLeafNode(otherlv_12, grammarAccess.getSimpleStateAccess().getRightCurlyBracketKeyword_3_5());
                         
@@ -1952,7 +1952,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefinedState"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:771:1: entryRuleRefinedState returns [EObject current=null] : iv_ruleRefinedState= ruleRefinedState EOF ;
+    // InternalFSM.g:771:1: entryRuleRefinedState returns [EObject current=null] : iv_ruleRefinedState= ruleRefinedState EOF ;
     public final EObject entryRuleRefinedState() throws RecognitionException {
         EObject current = null;
 
@@ -1960,17 +1960,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:772:2: (iv_ruleRefinedState= ruleRefinedState EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:773:2: iv_ruleRefinedState= ruleRefinedState EOF
+            // InternalFSM.g:772:2: (iv_ruleRefinedState= ruleRefinedState EOF )
+            // InternalFSM.g:773:2: iv_ruleRefinedState= ruleRefinedState EOF
             {
              newCompositeNode(grammarAccess.getRefinedStateRule()); 
-            pushFollow(FOLLOW_ruleRefinedState_in_entryRuleRefinedState1570);
+            pushFollow(FOLLOW_1);
             iv_ruleRefinedState=ruleRefinedState();
 
             state._fsp--;
 
              current =iv_ruleRefinedState; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedState1580); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1988,7 +1988,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefinedState"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:780:1: ruleRefinedState returns [EObject current=null] : (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' ) ;
+    // InternalFSM.g:780:1: ruleRefinedState returns [EObject current=null] : (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' ) ;
     public final EObject ruleRefinedState() throws RecognitionException {
         EObject current = null;
 
@@ -2013,21 +2013,21 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:783:28: ( (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:784:1: (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )
+            // InternalFSM.g:783:28: ( (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' ) )
+            // InternalFSM.g:784:1: (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:784:1: (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:784:3: otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}'
+            // InternalFSM.g:784:1: (otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}' )
+            // InternalFSM.g:784:3: otherlv_0= 'RefinedState' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )? (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )? otherlv_12= '}'
             {
-            otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleRefinedState1617); 
+            otherlv_0=(Token)match(input,23,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRefinedStateAccess().getRefinedStateKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:788:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:789:1: ( ruleFQN )
+            // InternalFSM.g:788:1: ( ( ruleFQN ) )
+            // InternalFSM.g:789:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:789:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:790:3: ruleFQN
+            // InternalFSM.g:789:1: ( ruleFQN )
+            // InternalFSM.g:790:3: ruleFQN
             {
 
             			if (current==null) {
@@ -2037,7 +2037,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getRefinedStateAccess().getTargetStateCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleRefinedState1640);
+            pushFollow(FOLLOW_16);
             ruleFQN();
 
             state._fsp--;
@@ -2051,7 +2051,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:803:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalFSM.g:803:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2060,15 +2060,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:804:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:804:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:804:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:805:3: lv_docu_2_0= ruleDocumentation
+                    // InternalFSM.g:804:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:805:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleRefinedState1661);
+                    pushFollow(FOLLOW_8);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -2081,7 +2081,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2093,11 +2093,11 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,15,FOLLOW_15_in_ruleRefinedState1674); 
+            otherlv_3=(Token)match(input,15,FOLLOW_11); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRefinedStateAccess().getLeftCurlyBracketKeyword_3());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:825:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
+            // InternalFSM.g:825:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2106,22 +2106,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:825:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
+                    // InternalFSM.g:825:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
                     {
-                    otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleRefinedState1687); 
+                    otherlv_4=(Token)match(input,19,FOLLOW_8); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getRefinedStateAccess().getEntryKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:829:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:830:1: (lv_entryCode_5_0= ruleDetailCode )
+                    // InternalFSM.g:829:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
+                    // InternalFSM.g:830:1: (lv_entryCode_5_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:830:1: (lv_entryCode_5_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:831:3: lv_entryCode_5_0= ruleDetailCode
+                    // InternalFSM.g:830:1: (lv_entryCode_5_0= ruleDetailCode )
+                    // InternalFSM.g:831:3: lv_entryCode_5_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getEntryCodeDetailCodeParserRuleCall_4_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedState1708);
+                    pushFollow(FOLLOW_12);
                     lv_entryCode_5_0=ruleDetailCode();
 
                     state._fsp--;
@@ -2134,7 +2134,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"entryCode",
                             		lv_entryCode_5_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2149,7 +2149,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:847:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
+            // InternalFSM.g:847:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2158,22 +2158,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:847:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
+                    // InternalFSM.g:847:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
                     {
-                    otherlv_6=(Token)match(input,20,FOLLOW_20_in_ruleRefinedState1723); 
+                    otherlv_6=(Token)match(input,20,FOLLOW_8); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getRefinedStateAccess().getExitKeyword_5_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:851:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:852:1: (lv_exitCode_7_0= ruleDetailCode )
+                    // InternalFSM.g:851:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
+                    // InternalFSM.g:852:1: (lv_exitCode_7_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:852:1: (lv_exitCode_7_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:853:3: lv_exitCode_7_0= ruleDetailCode
+                    // InternalFSM.g:852:1: (lv_exitCode_7_0= ruleDetailCode )
+                    // InternalFSM.g:853:3: lv_exitCode_7_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getExitCodeDetailCodeParserRuleCall_5_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedState1744);
+                    pushFollow(FOLLOW_13);
                     lv_exitCode_7_0=ruleDetailCode();
 
                     state._fsp--;
@@ -2186,7 +2186,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"exitCode",
                             		lv_exitCode_7_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2201,7 +2201,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:869:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
+            // InternalFSM.g:869:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2210,22 +2210,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:869:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
+                    // InternalFSM.g:869:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
                     {
-                    otherlv_8=(Token)match(input,21,FOLLOW_21_in_ruleRefinedState1759); 
+                    otherlv_8=(Token)match(input,21,FOLLOW_8); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getRefinedStateAccess().getDoKeyword_6_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:873:1: ( (lv_doCode_9_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:874:1: (lv_doCode_9_0= ruleDetailCode )
+                    // InternalFSM.g:873:1: ( (lv_doCode_9_0= ruleDetailCode ) )
+                    // InternalFSM.g:874:1: (lv_doCode_9_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:874:1: (lv_doCode_9_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:875:3: lv_doCode_9_0= ruleDetailCode
+                    // InternalFSM.g:874:1: (lv_doCode_9_0= ruleDetailCode )
+                    // InternalFSM.g:875:3: lv_doCode_9_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getDoCodeDetailCodeParserRuleCall_6_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedState1780);
+                    pushFollow(FOLLOW_14);
                     lv_doCode_9_0=ruleDetailCode();
 
                     state._fsp--;
@@ -2238,7 +2238,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"doCode",
                             		lv_doCode_9_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2253,7 +2253,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:891:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
+            // InternalFSM.g:891:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2262,22 +2262,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:891:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
+                    // InternalFSM.g:891:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
                     {
-                    otherlv_10=(Token)match(input,22,FOLLOW_22_in_ruleRefinedState1795); 
+                    otherlv_10=(Token)match(input,22,FOLLOW_8); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getRefinedStateAccess().getSubgraphKeyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:895:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:896:1: (lv_subgraph_11_0= ruleStateGraph )
+                    // InternalFSM.g:895:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
+                    // InternalFSM.g:896:1: (lv_subgraph_11_0= ruleStateGraph )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:896:1: (lv_subgraph_11_0= ruleStateGraph )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:897:3: lv_subgraph_11_0= ruleStateGraph
+                    // InternalFSM.g:896:1: (lv_subgraph_11_0= ruleStateGraph )
+                    // InternalFSM.g:897:3: lv_subgraph_11_0= ruleStateGraph
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getSubgraphStateGraphParserRuleCall_7_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleStateGraph_in_ruleRefinedState1816);
+                    pushFollow(FOLLOW_15);
                     lv_subgraph_11_0=ruleStateGraph();
 
                     state._fsp--;
@@ -2290,7 +2290,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"subgraph",
                             		lv_subgraph_11_0, 
-                            		"StateGraph");
+                            		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2305,7 +2305,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,16,FOLLOW_16_in_ruleRefinedState1830); 
+            otherlv_12=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getRefinedStateAccess().getRightCurlyBracketKeyword_8());
                 
@@ -2330,7 +2330,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDetailCode"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:925:1: entryRuleDetailCode returns [EObject current=null] : iv_ruleDetailCode= ruleDetailCode EOF ;
+    // InternalFSM.g:925:1: entryRuleDetailCode returns [EObject current=null] : iv_ruleDetailCode= ruleDetailCode EOF ;
     public final EObject entryRuleDetailCode() throws RecognitionException {
         EObject current = null;
 
@@ -2338,17 +2338,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:926:2: (iv_ruleDetailCode= ruleDetailCode EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:927:2: iv_ruleDetailCode= ruleDetailCode EOF
+            // InternalFSM.g:926:2: (iv_ruleDetailCode= ruleDetailCode EOF )
+            // InternalFSM.g:927:2: iv_ruleDetailCode= ruleDetailCode EOF
             {
              newCompositeNode(grammarAccess.getDetailCodeRule()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_entryRuleDetailCode1866);
+            pushFollow(FOLLOW_1);
             iv_ruleDetailCode=ruleDetailCode();
 
             state._fsp--;
 
              current =iv_ruleDetailCode; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDetailCode1876); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2366,7 +2366,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDetailCode"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:934:1: ruleDetailCode returns [EObject current=null] : ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) ;
+    // InternalFSM.g:934:1: ruleDetailCode returns [EObject current=null] : ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) ;
     public final EObject ruleDetailCode() throws RecognitionException {
         EObject current = null;
 
@@ -2377,14 +2377,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:937:28: ( ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:938:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
+            // InternalFSM.g:937:28: ( ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) )
+            // InternalFSM.g:938:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:938:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:938:2: () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}'
+            // InternalFSM.g:938:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
+            // InternalFSM.g:938:2: () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}'
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:938:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:939:5: 
+            // InternalFSM.g:938:2: ()
+            // InternalFSM.g:939:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2394,13 +2394,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:944:2: ( (lv_used_1_0= '{' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:945:1: (lv_used_1_0= '{' )
+            // InternalFSM.g:944:2: ( (lv_used_1_0= '{' ) )
+            // InternalFSM.g:945:1: (lv_used_1_0= '{' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:945:1: (lv_used_1_0= '{' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:946:3: lv_used_1_0= '{'
+            // InternalFSM.g:945:1: (lv_used_1_0= '{' )
+            // InternalFSM.g:946:3: lv_used_1_0= '{'
             {
-            lv_used_1_0=(Token)match(input,15,FOLLOW_15_in_ruleDetailCode1928); 
+            lv_used_1_0=(Token)match(input,15,FOLLOW_17); 
 
                     newLeafNode(lv_used_1_0, grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0());
                 
@@ -2416,7 +2416,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:959:2: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalFSM.g:959:2: ( (lv_lines_2_0= RULE_STRING ) )*
             loop19:
             do {
                 int alt19=2;
@@ -2429,12 +2429,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt19) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:960:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalFSM.g:960:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:960:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:961:3: lv_lines_2_0= RULE_STRING
+            	    // InternalFSM.g:960:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalFSM.g:961:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDetailCode1958); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_17); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDetailCodeAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -2446,7 +2446,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -2460,7 +2460,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,16,FOLLOW_16_in_ruleDetailCode1976); 
+            otherlv_3=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDetailCodeAccess().getRightCurlyBracketKeyword_3());
                 
@@ -2485,7 +2485,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTrPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:989:1: entryRuleTrPoint returns [EObject current=null] : iv_ruleTrPoint= ruleTrPoint EOF ;
+    // InternalFSM.g:989:1: entryRuleTrPoint returns [EObject current=null] : iv_ruleTrPoint= ruleTrPoint EOF ;
     public final EObject entryRuleTrPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2493,17 +2493,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:990:2: (iv_ruleTrPoint= ruleTrPoint EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:991:2: iv_ruleTrPoint= ruleTrPoint EOF
+            // InternalFSM.g:990:2: (iv_ruleTrPoint= ruleTrPoint EOF )
+            // InternalFSM.g:991:2: iv_ruleTrPoint= ruleTrPoint EOF
             {
              newCompositeNode(grammarAccess.getTrPointRule()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_entryRuleTrPoint2012);
+            pushFollow(FOLLOW_1);
             iv_ruleTrPoint=ruleTrPoint();
 
             state._fsp--;
 
              current =iv_ruleTrPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPoint2022); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2521,7 +2521,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:998:1: ruleTrPoint returns [EObject current=null] : (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) ;
+    // InternalFSM.g:998:1: ruleTrPoint returns [EObject current=null] : (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) ;
     public final EObject ruleTrPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2535,10 +2535,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1001:28: ( (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1002:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
+            // InternalFSM.g:1001:28: ( (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) )
+            // InternalFSM.g:1002:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1002:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
+            // InternalFSM.g:1002:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
             int alt20=3;
             switch ( input.LA(1) ) {
             case 24:
@@ -2566,12 +2566,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1003:5: this_TransitionPoint_0= ruleTransitionPoint
+                    // InternalFSM.g:1003:5: this_TransitionPoint_0= ruleTransitionPoint
                     {
                      
                             newCompositeNode(grammarAccess.getTrPointAccess().getTransitionPointParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleTransitionPoint_in_ruleTrPoint2069);
+                    pushFollow(FOLLOW_2);
                     this_TransitionPoint_0=ruleTransitionPoint();
 
                     state._fsp--;
@@ -2584,12 +2584,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1013:5: this_EntryPoint_1= ruleEntryPoint
+                    // InternalFSM.g:1013:5: this_EntryPoint_1= ruleEntryPoint
                     {
                      
                             newCompositeNode(grammarAccess.getTrPointAccess().getEntryPointParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEntryPoint_in_ruleTrPoint2096);
+                    pushFollow(FOLLOW_2);
                     this_EntryPoint_1=ruleEntryPoint();
 
                     state._fsp--;
@@ -2602,12 +2602,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1023:5: this_ExitPoint_2= ruleExitPoint
+                    // InternalFSM.g:1023:5: this_ExitPoint_2= ruleExitPoint
                     {
                      
                             newCompositeNode(grammarAccess.getTrPointAccess().getExitPointParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleExitPoint_in_ruleTrPoint2123);
+                    pushFollow(FOLLOW_2);
                     this_ExitPoint_2=ruleExitPoint();
 
                     state._fsp--;
@@ -2640,7 +2640,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransitionPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1039:1: entryRuleTransitionPoint returns [EObject current=null] : iv_ruleTransitionPoint= ruleTransitionPoint EOF ;
+    // InternalFSM.g:1039:1: entryRuleTransitionPoint returns [EObject current=null] : iv_ruleTransitionPoint= ruleTransitionPoint EOF ;
     public final EObject entryRuleTransitionPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2648,17 +2648,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1040:2: (iv_ruleTransitionPoint= ruleTransitionPoint EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1041:2: iv_ruleTransitionPoint= ruleTransitionPoint EOF
+            // InternalFSM.g:1040:2: (iv_ruleTransitionPoint= ruleTransitionPoint EOF )
+            // InternalFSM.g:1041:2: iv_ruleTransitionPoint= ruleTransitionPoint EOF
             {
              newCompositeNode(grammarAccess.getTransitionPointRule()); 
-            pushFollow(FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint2158);
+            pushFollow(FOLLOW_1);
             iv_ruleTransitionPoint=ruleTransitionPoint();
 
             state._fsp--;
 
              current =iv_ruleTransitionPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionPoint2168); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2676,7 +2676,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransitionPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1048:1: ruleTransitionPoint returns [EObject current=null] : ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) ;
+    // InternalFSM.g:1048:1: ruleTransitionPoint returns [EObject current=null] : ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) ;
     public final EObject ruleTransitionPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2687,13 +2687,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1051:28: ( ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1052:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
+            // InternalFSM.g:1051:28: ( ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) )
+            // InternalFSM.g:1052:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1052:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1052:2: ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) )
+            // InternalFSM.g:1052:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
+            // InternalFSM.g:1052:2: ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1052:2: ( (lv_handler_0_0= 'handler' ) )?
+            // InternalFSM.g:1052:2: ( (lv_handler_0_0= 'handler' ) )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2702,12 +2702,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1053:1: (lv_handler_0_0= 'handler' )
+                    // InternalFSM.g:1053:1: (lv_handler_0_0= 'handler' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1053:1: (lv_handler_0_0= 'handler' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1054:3: lv_handler_0_0= 'handler'
+                    // InternalFSM.g:1053:1: (lv_handler_0_0= 'handler' )
+                    // InternalFSM.g:1054:3: lv_handler_0_0= 'handler'
                     {
-                    lv_handler_0_0=(Token)match(input,24,FOLLOW_24_in_ruleTransitionPoint2211); 
+                    lv_handler_0_0=(Token)match(input,24,FOLLOW_18); 
 
                             newLeafNode(lv_handler_0_0, grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0());
                         
@@ -2726,17 +2726,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleTransitionPoint2237); 
+            otherlv_1=(Token)match(input,25,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTransitionPointAccess().getTransitionPointKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1071:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1072:1: (lv_name_2_0= RULE_ID )
+            // InternalFSM.g:1071:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalFSM.g:1072:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1072:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1073:3: lv_name_2_0= RULE_ID
+            // InternalFSM.g:1072:1: (lv_name_2_0= RULE_ID )
+            // InternalFSM.g:1073:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTransitionPoint2254); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getTransitionPointAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -2748,7 +2748,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2777,7 +2777,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEntryPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1097:1: entryRuleEntryPoint returns [EObject current=null] : iv_ruleEntryPoint= ruleEntryPoint EOF ;
+    // InternalFSM.g:1097:1: entryRuleEntryPoint returns [EObject current=null] : iv_ruleEntryPoint= ruleEntryPoint EOF ;
     public final EObject entryRuleEntryPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2785,17 +2785,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1098:2: (iv_ruleEntryPoint= ruleEntryPoint EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1099:2: iv_ruleEntryPoint= ruleEntryPoint EOF
+            // InternalFSM.g:1098:2: (iv_ruleEntryPoint= ruleEntryPoint EOF )
+            // InternalFSM.g:1099:2: iv_ruleEntryPoint= ruleEntryPoint EOF
             {
              newCompositeNode(grammarAccess.getEntryPointRule()); 
-            pushFollow(FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint2295);
+            pushFollow(FOLLOW_1);
             iv_ruleEntryPoint=ruleEntryPoint();
 
             state._fsp--;
 
              current =iv_ruleEntryPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEntryPoint2305); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2813,7 +2813,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEntryPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1106:1: ruleEntryPoint returns [EObject current=null] : (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalFSM.g:1106:1: ruleEntryPoint returns [EObject current=null] : (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleEntryPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2823,23 +2823,23 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1109:28: ( (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1110:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalFSM.g:1109:28: ( (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalFSM.g:1110:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1110:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1110:3: otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) )
+            // InternalFSM.g:1110:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalFSM.g:1110:3: otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,26,FOLLOW_26_in_ruleEntryPoint2342); 
+            otherlv_0=(Token)match(input,26,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getEntryPointAccess().getEntryPointKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1114:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1115:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:1114:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalFSM.g:1115:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1115:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1116:3: lv_name_1_0= RULE_ID
+            // InternalFSM.g:1115:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:1116:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntryPoint2359); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -2851,7 +2851,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2880,7 +2880,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExitPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1140:1: entryRuleExitPoint returns [EObject current=null] : iv_ruleExitPoint= ruleExitPoint EOF ;
+    // InternalFSM.g:1140:1: entryRuleExitPoint returns [EObject current=null] : iv_ruleExitPoint= ruleExitPoint EOF ;
     public final EObject entryRuleExitPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2888,17 +2888,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1141:2: (iv_ruleExitPoint= ruleExitPoint EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1142:2: iv_ruleExitPoint= ruleExitPoint EOF
+            // InternalFSM.g:1141:2: (iv_ruleExitPoint= ruleExitPoint EOF )
+            // InternalFSM.g:1142:2: iv_ruleExitPoint= ruleExitPoint EOF
             {
              newCompositeNode(grammarAccess.getExitPointRule()); 
-            pushFollow(FOLLOW_ruleExitPoint_in_entryRuleExitPoint2400);
+            pushFollow(FOLLOW_1);
             iv_ruleExitPoint=ruleExitPoint();
 
             state._fsp--;
 
              current =iv_ruleExitPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExitPoint2410); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2916,7 +2916,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExitPoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1149:1: ruleExitPoint returns [EObject current=null] : (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalFSM.g:1149:1: ruleExitPoint returns [EObject current=null] : (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleExitPoint() throws RecognitionException {
         EObject current = null;
 
@@ -2926,23 +2926,23 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1152:28: ( (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1153:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalFSM.g:1152:28: ( (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalFSM.g:1153:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1153:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1153:3: otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) )
+            // InternalFSM.g:1153:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalFSM.g:1153:3: otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleExitPoint2447); 
+            otherlv_0=(Token)match(input,27,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getExitPointAccess().getExitPointKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1157:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1158:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:1157:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalFSM.g:1158:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1158:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1159:3: lv_name_1_0= RULE_ID
+            // InternalFSM.g:1158:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:1159:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExitPoint2464); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -2954,7 +2954,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2983,7 +2983,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleChoicePoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1183:1: entryRuleChoicePoint returns [EObject current=null] : iv_ruleChoicePoint= ruleChoicePoint EOF ;
+    // InternalFSM.g:1183:1: entryRuleChoicePoint returns [EObject current=null] : iv_ruleChoicePoint= ruleChoicePoint EOF ;
     public final EObject entryRuleChoicePoint() throws RecognitionException {
         EObject current = null;
 
@@ -2991,17 +2991,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1184:2: (iv_ruleChoicePoint= ruleChoicePoint EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1185:2: iv_ruleChoicePoint= ruleChoicePoint EOF
+            // InternalFSM.g:1184:2: (iv_ruleChoicePoint= ruleChoicePoint EOF )
+            // InternalFSM.g:1185:2: iv_ruleChoicePoint= ruleChoicePoint EOF
             {
              newCompositeNode(grammarAccess.getChoicePointRule()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint2505);
+            pushFollow(FOLLOW_1);
             iv_ruleChoicePoint=ruleChoicePoint();
 
             state._fsp--;
 
              current =iv_ruleChoicePoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicePoint2515); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3019,7 +3019,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleChoicePoint"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1192:1: ruleChoicePoint returns [EObject current=null] : (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) ;
+    // InternalFSM.g:1192:1: ruleChoicePoint returns [EObject current=null] : (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) ;
     public final EObject ruleChoicePoint() throws RecognitionException {
         EObject current = null;
 
@@ -3031,23 +3031,23 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1195:28: ( (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1196:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
+            // InternalFSM.g:1195:28: ( (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) )
+            // InternalFSM.g:1196:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1196:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1196:3: otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalFSM.g:1196:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
+            // InternalFSM.g:1196:3: otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleChoicePoint2552); 
+            otherlv_0=(Token)match(input,28,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getChoicePointAccess().getChoicePointKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1200:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1201:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:1200:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalFSM.g:1201:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1201:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1202:3: lv_name_1_0= RULE_ID
+            // InternalFSM.g:1201:1: (lv_name_1_0= RULE_ID )
+            // InternalFSM.g:1202:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleChoicePoint2569); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_19); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getChoicePointAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -3059,7 +3059,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3067,7 +3067,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1218:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalFSM.g:1218:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -3076,15 +3076,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1219:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:1219:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1219:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1220:3: lv_docu_2_0= ruleDocumentation
+                    // InternalFSM.g:1219:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:1220:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getChoicePointAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleChoicePoint2595);
+                    pushFollow(FOLLOW_2);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -3097,7 +3097,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3130,7 +3130,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1244:1: entryRuleTransition returns [EObject current=null] : iv_ruleTransition= ruleTransition EOF ;
+    // InternalFSM.g:1246:1: entryRuleTransition returns [EObject current=null] : iv_ruleTransition= ruleTransition EOF ;
     public final EObject entryRuleTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3138,17 +3138,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1245:2: (iv_ruleTransition= ruleTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1246:2: iv_ruleTransition= ruleTransition EOF
+            // InternalFSM.g:1247:2: (iv_ruleTransition= ruleTransition EOF )
+            // InternalFSM.g:1248:2: iv_ruleTransition= ruleTransition EOF
             {
              newCompositeNode(grammarAccess.getTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransition_in_entryRuleTransition2632);
+            pushFollow(FOLLOW_1);
             iv_ruleTransition=ruleTransition();
 
             state._fsp--;
 
              current =iv_ruleTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransition2642); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3166,7 +3166,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1253:1: ruleTransition returns [EObject current=null] : (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) ;
+    // InternalFSM.g:1255:1: ruleTransition returns [EObject current=null] : (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) ;
     public final EObject ruleTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3178,10 +3178,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1256:28: ( (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1257:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
+            // InternalFSM.g:1258:28: ( (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) )
+            // InternalFSM.g:1259:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1257:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
+            // InternalFSM.g:1259:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -3245,12 +3245,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1258:5: this_InitialTransition_0= ruleInitialTransition
+                    // InternalFSM.g:1260:5: this_InitialTransition_0= ruleInitialTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionAccess().getInitialTransitionParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleInitialTransition_in_ruleTransition2689);
+                    pushFollow(FOLLOW_2);
                     this_InitialTransition_0=ruleInitialTransition();
 
                     state._fsp--;
@@ -3263,12 +3263,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1268:5: this_NonInitialTransition_1= ruleNonInitialTransition
+                    // InternalFSM.g:1270:5: this_NonInitialTransition_1= ruleNonInitialTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionAccess().getNonInitialTransitionParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNonInitialTransition_in_ruleTransition2716);
+                    pushFollow(FOLLOW_2);
                     this_NonInitialTransition_1=ruleNonInitialTransition();
 
                     state._fsp--;
@@ -3301,7 +3301,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNonInitialTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1284:1: entryRuleNonInitialTransition returns [EObject current=null] : iv_ruleNonInitialTransition= ruleNonInitialTransition EOF ;
+    // InternalFSM.g:1286:1: entryRuleNonInitialTransition returns [EObject current=null] : iv_ruleNonInitialTransition= ruleNonInitialTransition EOF ;
     public final EObject entryRuleNonInitialTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3309,17 +3309,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1285:2: (iv_ruleNonInitialTransition= ruleNonInitialTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1286:2: iv_ruleNonInitialTransition= ruleNonInitialTransition EOF
+            // InternalFSM.g:1287:2: (iv_ruleNonInitialTransition= ruleNonInitialTransition EOF )
+            // InternalFSM.g:1288:2: iv_ruleNonInitialTransition= ruleNonInitialTransition EOF
             {
              newCompositeNode(grammarAccess.getNonInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition2751);
+            pushFollow(FOLLOW_1);
             iv_ruleNonInitialTransition=ruleNonInitialTransition();
 
             state._fsp--;
 
              current =iv_ruleNonInitialTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNonInitialTransition2761); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3337,7 +3337,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNonInitialTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1293:1: ruleNonInitialTransition returns [EObject current=null] : (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) ;
+    // InternalFSM.g:1295:1: ruleNonInitialTransition returns [EObject current=null] : (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) ;
     public final EObject ruleNonInitialTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3351,20 +3351,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1296:28: ( (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1297:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
+            // InternalFSM.g:1298:28: ( (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) )
+            // InternalFSM.g:1299:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1297:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
+            // InternalFSM.g:1299:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
             int alt24=3;
             alt24 = dfa24.predict(input);
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1298:5: this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition
+                    // InternalFSM.g:1300:5: this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition
                     {
                      
                             newCompositeNode(grammarAccess.getNonInitialTransitionAccess().getTransitionChainStartTransitionParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_ruleNonInitialTransition2808);
+                    pushFollow(FOLLOW_2);
                     this_TransitionChainStartTransition_0=ruleTransitionChainStartTransition();
 
                     state._fsp--;
@@ -3377,12 +3377,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1308:5: this_ContinuationTransition_1= ruleContinuationTransition
+                    // InternalFSM.g:1310:5: this_ContinuationTransition_1= ruleContinuationTransition
                     {
                      
                             newCompositeNode(grammarAccess.getNonInitialTransitionAccess().getContinuationTransitionParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleContinuationTransition_in_ruleNonInitialTransition2835);
+                    pushFollow(FOLLOW_2);
                     this_ContinuationTransition_1=ruleContinuationTransition();
 
                     state._fsp--;
@@ -3395,12 +3395,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1318:5: this_CPBranchTransition_2= ruleCPBranchTransition
+                    // InternalFSM.g:1320:5: this_CPBranchTransition_2= ruleCPBranchTransition
                     {
                      
                             newCompositeNode(grammarAccess.getNonInitialTransitionAccess().getCPBranchTransitionParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleCPBranchTransition_in_ruleNonInitialTransition2862);
+                    pushFollow(FOLLOW_2);
                     this_CPBranchTransition_2=ruleCPBranchTransition();
 
                     state._fsp--;
@@ -3433,7 +3433,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1334:1: entryRuleTransitionChainStartTransition returns [EObject current=null] : iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF ;
+    // InternalFSM.g:1336:1: entryRuleTransitionChainStartTransition returns [EObject current=null] : iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF ;
     public final EObject entryRuleTransitionChainStartTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3441,17 +3441,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1335:2: (iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1336:2: iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF
+            // InternalFSM.g:1337:2: (iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF )
+            // InternalFSM.g:1338:2: iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF
             {
              newCompositeNode(grammarAccess.getTransitionChainStartTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition2897);
+            pushFollow(FOLLOW_1);
             iv_ruleTransitionChainStartTransition=ruleTransitionChainStartTransition();
 
             state._fsp--;
 
              current =iv_ruleTransitionChainStartTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionChainStartTransition2907); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3469,7 +3469,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1343:1: ruleTransitionChainStartTransition returns [EObject current=null] : (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) ;
+    // InternalFSM.g:1345:1: ruleTransitionChainStartTransition returns [EObject current=null] : (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) ;
     public final EObject ruleTransitionChainStartTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3481,20 +3481,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1346:28: ( (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1347:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
+            // InternalFSM.g:1348:28: ( (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) )
+            // InternalFSM.g:1349:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1347:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
+            // InternalFSM.g:1349:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
             int alt25=2;
             alt25 = dfa25.predict(input);
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1348:5: this_TriggeredTransition_0= ruleTriggeredTransition
+                    // InternalFSM.g:1350:5: this_TriggeredTransition_0= ruleTriggeredTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionChainStartTransitionAccess().getTriggeredTransitionParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleTriggeredTransition_in_ruleTransitionChainStartTransition2954);
+                    pushFollow(FOLLOW_2);
                     this_TriggeredTransition_0=ruleTriggeredTransition();
 
                     state._fsp--;
@@ -3507,12 +3507,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1358:5: this_GuardedTransition_1= ruleGuardedTransition
+                    // InternalFSM.g:1360:5: this_GuardedTransition_1= ruleGuardedTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionChainStartTransitionAccess().getGuardedTransitionParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleGuardedTransition_in_ruleTransitionChainStartTransition2981);
+                    pushFollow(FOLLOW_2);
                     this_GuardedTransition_1=ruleGuardedTransition();
 
                     state._fsp--;
@@ -3545,7 +3545,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInitialTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1374:1: entryRuleInitialTransition returns [EObject current=null] : iv_ruleInitialTransition= ruleInitialTransition EOF ;
+    // InternalFSM.g:1376:1: entryRuleInitialTransition returns [EObject current=null] : iv_ruleInitialTransition= ruleInitialTransition EOF ;
     public final EObject entryRuleInitialTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3553,17 +3553,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1375:2: (iv_ruleInitialTransition= ruleInitialTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1376:2: iv_ruleInitialTransition= ruleInitialTransition EOF
+            // InternalFSM.g:1377:2: (iv_ruleInitialTransition= ruleInitialTransition EOF )
+            // InternalFSM.g:1378:2: iv_ruleInitialTransition= ruleInitialTransition EOF
             {
              newCompositeNode(grammarAccess.getInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition3016);
+            pushFollow(FOLLOW_1);
             iv_ruleInitialTransition=ruleInitialTransition();
 
             state._fsp--;
 
              current =iv_ruleInitialTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInitialTransition3026); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3581,7 +3581,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInitialTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1383:1: ruleInitialTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) ;
+    // InternalFSM.g:1385:1: ruleInitialTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) ;
     public final EObject ruleInitialTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3603,17 +3603,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1386:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1387:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
+            // InternalFSM.g:1388:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) )
+            // InternalFSM.g:1389:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1387:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1387:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
+            // InternalFSM.g:1389:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
+            // InternalFSM.g:1389:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' otherlv_3= 'initial' otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
             {
-            otherlv_0=(Token)match(input,29,FOLLOW_29_in_ruleInitialTransition3063); 
+            otherlv_0=(Token)match(input,29,FOLLOW_20); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getInitialTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1391:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalFSM.g:1393:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3622,12 +3622,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1392:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1394:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1392:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1393:3: lv_name_1_0= RULE_ID
+                    // InternalFSM.g:1394:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1395:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInitialTransition3080); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getInitialTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -3639,7 +3639,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -3650,28 +3650,28 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,30,FOLLOW_30_in_ruleInitialTransition3098); 
+            otherlv_2=(Token)match(input,30,FOLLOW_22); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getInitialTransitionAccess().getColonKeyword_2());
                 
-            otherlv_3=(Token)match(input,31,FOLLOW_31_in_ruleInitialTransition3110); 
+            otherlv_3=(Token)match(input,31,FOLLOW_23); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getInitialTransitionAccess().getInitialKeyword_3());
                 
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleInitialTransition3122); 
+            otherlv_4=(Token)match(input,32,FOLLOW_24); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getInitialTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1421:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1422:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1423:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1424:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1422:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1423:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalFSM.g:1424:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1425:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getInitialTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleInitialTransition3143);
+            pushFollow(FOLLOW_9);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -3684,7 +3684,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -3693,7 +3693,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1439:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalFSM.g:1441:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -3702,15 +3702,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1440:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1442:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1440:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1441:3: lv_docu_6_0= ruleDocumentation
+                    // InternalFSM.g:1442:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1443:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getInitialTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleInitialTransition3164);
+                    pushFollow(FOLLOW_10);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -3723,7 +3723,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3735,7 +3735,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1457:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
+            // InternalFSM.g:1459:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -3744,13 +3744,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1457:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
+                    // InternalFSM.g:1459:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
                     {
-                    otherlv_7=(Token)match(input,15,FOLLOW_15_in_ruleInitialTransition3178); 
+                    otherlv_7=(Token)match(input,15,FOLLOW_25); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getInitialTransitionAccess().getLeftCurlyBracketKeyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1461:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
+                    // InternalFSM.g:1463:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
                     int alt28=2;
                     int LA28_0 = input.LA(1);
 
@@ -3759,22 +3759,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt28) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1461:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalFSM.g:1463:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
                             {
-                            otherlv_8=(Token)match(input,33,FOLLOW_33_in_ruleInitialTransition3191); 
+                            otherlv_8=(Token)match(input,33,FOLLOW_8); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getInitialTransitionAccess().getActionKeyword_7_1_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1465:1: ( (lv_action_9_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1466:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalFSM.g:1467:1: ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalFSM.g:1468:1: (lv_action_9_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1466:1: (lv_action_9_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1467:3: lv_action_9_0= ruleDetailCode
+                            // InternalFSM.g:1468:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalFSM.g:1469:3: lv_action_9_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getInitialTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleInitialTransition3212);
+                            pushFollow(FOLLOW_15);
                             lv_action_9_0=ruleDetailCode();
 
                             state._fsp--;
@@ -3787,7 +3787,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"action",
                                     		lv_action_9_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -3802,7 +3802,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,16,FOLLOW_16_in_ruleInitialTransition3226); 
+                    otherlv_10=(Token)match(input,16,FOLLOW_2); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getInitialTransitionAccess().getRightCurlyBracketKeyword_7_2());
                         
@@ -3833,7 +3833,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleContinuationTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1495:1: entryRuleContinuationTransition returns [EObject current=null] : iv_ruleContinuationTransition= ruleContinuationTransition EOF ;
+    // InternalFSM.g:1497:1: entryRuleContinuationTransition returns [EObject current=null] : iv_ruleContinuationTransition= ruleContinuationTransition EOF ;
     public final EObject entryRuleContinuationTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3841,17 +3841,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1496:2: (iv_ruleContinuationTransition= ruleContinuationTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1497:2: iv_ruleContinuationTransition= ruleContinuationTransition EOF
+            // InternalFSM.g:1498:2: (iv_ruleContinuationTransition= ruleContinuationTransition EOF )
+            // InternalFSM.g:1499:2: iv_ruleContinuationTransition= ruleContinuationTransition EOF
             {
              newCompositeNode(grammarAccess.getContinuationTransitionRule()); 
-            pushFollow(FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition3264);
+            pushFollow(FOLLOW_1);
             iv_ruleContinuationTransition=ruleContinuationTransition();
 
             state._fsp--;
 
              current =iv_ruleContinuationTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContinuationTransition3274); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3869,7 +3869,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleContinuationTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1504:1: ruleContinuationTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) ;
+    // InternalFSM.g:1506:1: ruleContinuationTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) ;
     public final EObject ruleContinuationTransition() throws RecognitionException {
         EObject current = null;
 
@@ -3892,17 +3892,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1507:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1508:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
+            // InternalFSM.g:1509:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? ) )
+            // InternalFSM.g:1510:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1508:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1508:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
+            // InternalFSM.g:1510:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )? )
+            // InternalFSM.g:1510:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
             {
-            otherlv_0=(Token)match(input,29,FOLLOW_29_in_ruleContinuationTransition3311); 
+            otherlv_0=(Token)match(input,29,FOLLOW_20); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getContinuationTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1512:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalFSM.g:1514:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -3911,12 +3911,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt30) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1513:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1515:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1513:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1514:3: lv_name_1_0= RULE_ID
+                    // InternalFSM.g:1515:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1516:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleContinuationTransition3328); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getContinuationTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -3928,7 +3928,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -3939,20 +3939,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,30,FOLLOW_30_in_ruleContinuationTransition3346); 
+            otherlv_2=(Token)match(input,30,FOLLOW_24); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getContinuationTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1534:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1535:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:1536:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1537:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1535:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1536:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalFSM.g:1537:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:1538:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition3367);
+            pushFollow(FOLLOW_23);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -3965,7 +3965,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -3974,20 +3974,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleContinuationTransition3379); 
+            otherlv_4=(Token)match(input,32,FOLLOW_24); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getContinuationTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1556:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1557:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1558:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1559:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1557:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1558:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalFSM.g:1559:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1560:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition3400);
+            pushFollow(FOLLOW_9);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -4000,7 +4000,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4009,7 +4009,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1574:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalFSM.g:1576:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -4018,15 +4018,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt31) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1575:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1577:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1575:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1576:3: lv_docu_6_0= ruleDocumentation
+                    // InternalFSM.g:1577:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1578:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleContinuationTransition3421);
+                    pushFollow(FOLLOW_10);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -4039,7 +4039,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4051,7 +4051,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1592:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
+            // InternalFSM.g:1594:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -4060,13 +4060,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1592:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
+                    // InternalFSM.g:1594:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
                     {
-                    otherlv_7=(Token)match(input,15,FOLLOW_15_in_ruleContinuationTransition3435); 
+                    otherlv_7=(Token)match(input,15,FOLLOW_25); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getContinuationTransitionAccess().getLeftCurlyBracketKeyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1596:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
+                    // InternalFSM.g:1598:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
                     int alt32=2;
                     int LA32_0 = input.LA(1);
 
@@ -4075,22 +4075,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt32) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1596:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalFSM.g:1598:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
                             {
-                            otherlv_8=(Token)match(input,33,FOLLOW_33_in_ruleContinuationTransition3448); 
+                            otherlv_8=(Token)match(input,33,FOLLOW_8); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getContinuationTransitionAccess().getActionKeyword_7_1_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1600:1: ( (lv_action_9_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1601:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalFSM.g:1602:1: ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalFSM.g:1603:1: (lv_action_9_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1601:1: (lv_action_9_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1602:3: lv_action_9_0= ruleDetailCode
+                            // InternalFSM.g:1603:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalFSM.g:1604:3: lv_action_9_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleContinuationTransition3469);
+                            pushFollow(FOLLOW_15);
                             lv_action_9_0=ruleDetailCode();
 
                             state._fsp--;
@@ -4103,7 +4103,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"action",
                                     		lv_action_9_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -4118,7 +4118,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,16,FOLLOW_16_in_ruleContinuationTransition3483); 
+                    otherlv_10=(Token)match(input,16,FOLLOW_2); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getContinuationTransitionAccess().getRightCurlyBracketKeyword_7_2());
                         
@@ -4149,7 +4149,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTriggeredTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1630:1: entryRuleTriggeredTransition returns [EObject current=null] : iv_ruleTriggeredTransition= ruleTriggeredTransition EOF ;
+    // InternalFSM.g:1632:1: entryRuleTriggeredTransition returns [EObject current=null] : iv_ruleTriggeredTransition= ruleTriggeredTransition EOF ;
     public final EObject entryRuleTriggeredTransition() throws RecognitionException {
         EObject current = null;
 
@@ -4157,17 +4157,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1631:2: (iv_ruleTriggeredTransition= ruleTriggeredTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1632:2: iv_ruleTriggeredTransition= ruleTriggeredTransition EOF
+            // InternalFSM.g:1633:2: (iv_ruleTriggeredTransition= ruleTriggeredTransition EOF )
+            // InternalFSM.g:1634:2: iv_ruleTriggeredTransition= ruleTriggeredTransition EOF
             {
              newCompositeNode(grammarAccess.getTriggeredTransitionRule()); 
-            pushFollow(FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition3521);
+            pushFollow(FOLLOW_1);
             iv_ruleTriggeredTransition=ruleTriggeredTransition();
 
             state._fsp--;
 
              current =iv_ruleTriggeredTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTriggeredTransition3531); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4185,7 +4185,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTriggeredTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1639:1: ruleTriggeredTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' ) ;
+    // InternalFSM.g:1641:1: ruleTriggeredTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' ) ;
     public final EObject ruleTriggeredTransition() throws RecognitionException {
         EObject current = null;
 
@@ -4216,17 +4216,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1642:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1643:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' )
+            // InternalFSM.g:1644:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' ) )
+            // InternalFSM.g:1645:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1643:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1643:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}'
+            // InternalFSM.g:1645:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}' )
+            // InternalFSM.g:1645:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'triggers' otherlv_9= '{' ( (lv_triggers_10_0= ruleTrigger ) ) (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )* otherlv_13= '}' (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )? otherlv_16= '}'
             {
-            otherlv_0=(Token)match(input,29,FOLLOW_29_in_ruleTriggeredTransition3568); 
+            otherlv_0=(Token)match(input,29,FOLLOW_20); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTriggeredTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1647:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalFSM.g:1649:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -4235,12 +4235,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt34) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1648:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1650:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1648:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1649:3: lv_name_1_0= RULE_ID
+                    // InternalFSM.g:1650:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1651:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTriggeredTransition3585); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getTriggeredTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -4252,7 +4252,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -4263,20 +4263,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,30,FOLLOW_30_in_ruleTriggeredTransition3603); 
+            otherlv_2=(Token)match(input,30,FOLLOW_24); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getTriggeredTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1669:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1670:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:1671:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1672:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1670:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1671:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalFSM.g:1672:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:1673:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition3624);
+            pushFollow(FOLLOW_23);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -4289,7 +4289,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4298,20 +4298,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleTriggeredTransition3636); 
+            otherlv_4=(Token)match(input,32,FOLLOW_24); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getTriggeredTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1691:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1692:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1693:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1694:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1692:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1693:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalFSM.g:1694:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1695:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition3657);
+            pushFollow(FOLLOW_16);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -4324,7 +4324,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4333,7 +4333,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1709:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalFSM.g:1711:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -4342,15 +4342,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt35) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1710:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1712:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1710:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1711:3: lv_docu_6_0= ruleDocumentation
+                    // InternalFSM.g:1712:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1713:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleTriggeredTransition3678);
+                    pushFollow(FOLLOW_8);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -4363,7 +4363,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4375,28 +4375,28 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,15,FOLLOW_15_in_ruleTriggeredTransition3691); 
+            otherlv_7=(Token)match(input,15,FOLLOW_26); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_7());
                 
-            otherlv_8=(Token)match(input,34,FOLLOW_34_in_ruleTriggeredTransition3703); 
+            otherlv_8=(Token)match(input,34,FOLLOW_8); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getTriggeredTransitionAccess().getTriggersKeyword_8());
                 
-            otherlv_9=(Token)match(input,15,FOLLOW_15_in_ruleTriggeredTransition3715); 
+            otherlv_9=(Token)match(input,15,FOLLOW_27); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_9());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1739:1: ( (lv_triggers_10_0= ruleTrigger ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1740:1: (lv_triggers_10_0= ruleTrigger )
+            // InternalFSM.g:1741:1: ( (lv_triggers_10_0= ruleTrigger ) )
+            // InternalFSM.g:1742:1: (lv_triggers_10_0= ruleTrigger )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1740:1: (lv_triggers_10_0= ruleTrigger )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1741:3: lv_triggers_10_0= ruleTrigger
+            // InternalFSM.g:1742:1: (lv_triggers_10_0= ruleTrigger )
+            // InternalFSM.g:1743:3: lv_triggers_10_0= ruleTrigger
             {
              
             	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_10_0()); 
             	    
-            pushFollow(FOLLOW_ruleTrigger_in_ruleTriggeredTransition3736);
+            pushFollow(FOLLOW_28);
             lv_triggers_10_0=ruleTrigger();
 
             state._fsp--;
@@ -4409,7 +4409,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"triggers",
                     		lv_triggers_10_0, 
-                    		"Trigger");
+                    		"org.eclipse.etrice.core.fsm.FSM.Trigger");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4418,7 +4418,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1757:2: (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )*
+            // InternalFSM.g:1759:2: (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )*
             loop36:
             do {
                 int alt36=2;
@@ -4431,22 +4431,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1757:4: otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) )
+            	    // InternalFSM.g:1759:4: otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) )
             	    {
-            	    otherlv_11=(Token)match(input,35,FOLLOW_35_in_ruleTriggeredTransition3749); 
+            	    otherlv_11=(Token)match(input,35,FOLLOW_27); 
 
             	        	newLeafNode(otherlv_11, grammarAccess.getTriggeredTransitionAccess().getOrKeyword_11_0());
             	        
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1761:1: ( (lv_triggers_12_0= ruleTrigger ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1762:1: (lv_triggers_12_0= ruleTrigger )
+            	    // InternalFSM.g:1763:1: ( (lv_triggers_12_0= ruleTrigger ) )
+            	    // InternalFSM.g:1764:1: (lv_triggers_12_0= ruleTrigger )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1762:1: (lv_triggers_12_0= ruleTrigger )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1763:3: lv_triggers_12_0= ruleTrigger
+            	    // InternalFSM.g:1764:1: (lv_triggers_12_0= ruleTrigger )
+            	    // InternalFSM.g:1765:3: lv_triggers_12_0= ruleTrigger
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_11_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTrigger_in_ruleTriggeredTransition3770);
+            	    pushFollow(FOLLOW_28);
             	    lv_triggers_12_0=ruleTrigger();
 
             	    state._fsp--;
@@ -4459,7 +4459,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"triggers",
             	            		lv_triggers_12_0, 
-            	            		"Trigger");
+            	            		"org.eclipse.etrice.core.fsm.FSM.Trigger");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -4477,11 +4477,11 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_13=(Token)match(input,16,FOLLOW_16_in_ruleTriggeredTransition3784); 
+            otherlv_13=(Token)match(input,16,FOLLOW_25); 
 
                 	newLeafNode(otherlv_13, grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_12());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1783:1: (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )?
+            // InternalFSM.g:1785:1: (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )?
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -4490,22 +4490,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt37) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1783:3: otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) )
+                    // InternalFSM.g:1785:3: otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) )
                     {
-                    otherlv_14=(Token)match(input,33,FOLLOW_33_in_ruleTriggeredTransition3797); 
+                    otherlv_14=(Token)match(input,33,FOLLOW_8); 
 
                         	newLeafNode(otherlv_14, grammarAccess.getTriggeredTransitionAccess().getActionKeyword_13_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1787:1: ( (lv_action_15_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1788:1: (lv_action_15_0= ruleDetailCode )
+                    // InternalFSM.g:1789:1: ( (lv_action_15_0= ruleDetailCode ) )
+                    // InternalFSM.g:1790:1: (lv_action_15_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1788:1: (lv_action_15_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1789:3: lv_action_15_0= ruleDetailCode
+                    // InternalFSM.g:1790:1: (lv_action_15_0= ruleDetailCode )
+                    // InternalFSM.g:1791:3: lv_action_15_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getActionDetailCodeParserRuleCall_13_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleTriggeredTransition3818);
+                    pushFollow(FOLLOW_15);
                     lv_action_15_0=ruleDetailCode();
 
                     state._fsp--;
@@ -4518,7 +4518,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"action",
                             		lv_action_15_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4533,7 +4533,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_16=(Token)match(input,16,FOLLOW_16_in_ruleTriggeredTransition3832); 
+            otherlv_16=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_16, grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_14());
                 
@@ -4558,7 +4558,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleGuardedTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1817:1: entryRuleGuardedTransition returns [EObject current=null] : iv_ruleGuardedTransition= ruleGuardedTransition EOF ;
+    // InternalFSM.g:1819:1: entryRuleGuardedTransition returns [EObject current=null] : iv_ruleGuardedTransition= ruleGuardedTransition EOF ;
     public final EObject entryRuleGuardedTransition() throws RecognitionException {
         EObject current = null;
 
@@ -4566,17 +4566,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1818:2: (iv_ruleGuardedTransition= ruleGuardedTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1819:2: iv_ruleGuardedTransition= ruleGuardedTransition EOF
+            // InternalFSM.g:1820:2: (iv_ruleGuardedTransition= ruleGuardedTransition EOF )
+            // InternalFSM.g:1821:2: iv_ruleGuardedTransition= ruleGuardedTransition EOF
             {
              newCompositeNode(grammarAccess.getGuardedTransitionRule()); 
-            pushFollow(FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition3868);
+            pushFollow(FOLLOW_1);
             iv_ruleGuardedTransition=ruleGuardedTransition();
 
             state._fsp--;
 
              current =iv_ruleGuardedTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuardedTransition3878); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4594,7 +4594,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGuardedTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1826:1: ruleGuardedTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) ;
+    // InternalFSM.g:1828:1: ruleGuardedTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) ;
     public final EObject ruleGuardedTransition() throws RecognitionException {
         EObject current = null;
 
@@ -4620,17 +4620,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1829:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1830:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
+            // InternalFSM.g:1831:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) )
+            // InternalFSM.g:1832:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1830:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1830:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}'
+            // InternalFSM.g:1832:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
+            // InternalFSM.g:1832:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'guard' ( (lv_guard_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}'
             {
-            otherlv_0=(Token)match(input,29,FOLLOW_29_in_ruleGuardedTransition3915); 
+            otherlv_0=(Token)match(input,29,FOLLOW_20); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getGuardedTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1834:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalFSM.g:1836:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -4639,12 +4639,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1835:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1837:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1835:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1836:3: lv_name_1_0= RULE_ID
+                    // InternalFSM.g:1837:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1838:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGuardedTransition3932); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getGuardedTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -4656,7 +4656,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -4667,20 +4667,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,30,FOLLOW_30_in_ruleGuardedTransition3950); 
+            otherlv_2=(Token)match(input,30,FOLLOW_24); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getGuardedTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1856:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1857:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:1858:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1859:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1857:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1858:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalFSM.g:1859:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:1860:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition3971);
+            pushFollow(FOLLOW_23);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -4693,7 +4693,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4702,20 +4702,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleGuardedTransition3983); 
+            otherlv_4=(Token)match(input,32,FOLLOW_24); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getGuardedTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1878:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1879:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1880:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:1881:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1879:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1880:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalFSM.g:1881:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:1882:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition4004);
+            pushFollow(FOLLOW_16);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -4728,7 +4728,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4737,7 +4737,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1896:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalFSM.g:1898:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -4746,15 +4746,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt39) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1897:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1899:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1897:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1898:3: lv_docu_6_0= ruleDocumentation
+                    // InternalFSM.g:1899:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:1900:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleGuardedTransition4025);
+                    pushFollow(FOLLOW_8);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -4767,7 +4767,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4779,24 +4779,24 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,15,FOLLOW_15_in_ruleGuardedTransition4038); 
+            otherlv_7=(Token)match(input,15,FOLLOW_29); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getGuardedTransitionAccess().getLeftCurlyBracketKeyword_7());
                 
-            otherlv_8=(Token)match(input,36,FOLLOW_36_in_ruleGuardedTransition4050); 
+            otherlv_8=(Token)match(input,36,FOLLOW_8); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getGuardedTransitionAccess().getGuardKeyword_8());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1922:1: ( (lv_guard_9_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1923:1: (lv_guard_9_0= ruleDetailCode )
+            // InternalFSM.g:1924:1: ( (lv_guard_9_0= ruleDetailCode ) )
+            // InternalFSM.g:1925:1: (lv_guard_9_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1923:1: (lv_guard_9_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1924:3: lv_guard_9_0= ruleDetailCode
+            // InternalFSM.g:1925:1: (lv_guard_9_0= ruleDetailCode )
+            // InternalFSM.g:1926:3: lv_guard_9_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getGuardDetailCodeParserRuleCall_9_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleGuardedTransition4071);
+            pushFollow(FOLLOW_25);
             lv_guard_9_0=ruleDetailCode();
 
             state._fsp--;
@@ -4809,7 +4809,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"guard",
                     		lv_guard_9_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4818,7 +4818,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1940:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
+            // InternalFSM.g:1942:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -4827,22 +4827,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1940:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalFSM.g:1942:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
                     {
-                    otherlv_10=(Token)match(input,33,FOLLOW_33_in_ruleGuardedTransition4084); 
+                    otherlv_10=(Token)match(input,33,FOLLOW_8); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getGuardedTransitionAccess().getActionKeyword_10_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1944:1: ( (lv_action_11_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1945:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalFSM.g:1946:1: ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalFSM.g:1947:1: (lv_action_11_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1945:1: (lv_action_11_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1946:3: lv_action_11_0= ruleDetailCode
+                    // InternalFSM.g:1947:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalFSM.g:1948:3: lv_action_11_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleGuardedTransition4105);
+                    pushFollow(FOLLOW_15);
                     lv_action_11_0=ruleDetailCode();
 
                     state._fsp--;
@@ -4855,7 +4855,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"action",
                             		lv_action_11_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4870,7 +4870,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,16,FOLLOW_16_in_ruleGuardedTransition4119); 
+            otherlv_12=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getGuardedTransitionAccess().getRightCurlyBracketKeyword_11());
                 
@@ -4895,7 +4895,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleCPBranchTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1974:1: entryRuleCPBranchTransition returns [EObject current=null] : iv_ruleCPBranchTransition= ruleCPBranchTransition EOF ;
+    // InternalFSM.g:1976:1: entryRuleCPBranchTransition returns [EObject current=null] : iv_ruleCPBranchTransition= ruleCPBranchTransition EOF ;
     public final EObject entryRuleCPBranchTransition() throws RecognitionException {
         EObject current = null;
 
@@ -4903,17 +4903,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1975:2: (iv_ruleCPBranchTransition= ruleCPBranchTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1976:2: iv_ruleCPBranchTransition= ruleCPBranchTransition EOF
+            // InternalFSM.g:1977:2: (iv_ruleCPBranchTransition= ruleCPBranchTransition EOF )
+            // InternalFSM.g:1978:2: iv_ruleCPBranchTransition= ruleCPBranchTransition EOF
             {
              newCompositeNode(grammarAccess.getCPBranchTransitionRule()); 
-            pushFollow(FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition4155);
+            pushFollow(FOLLOW_1);
             iv_ruleCPBranchTransition=ruleCPBranchTransition();
 
             state._fsp--;
 
              current =iv_ruleCPBranchTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCPBranchTransition4165); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4931,7 +4931,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleCPBranchTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1983:1: ruleCPBranchTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) ;
+    // InternalFSM.g:1985:1: ruleCPBranchTransition returns [EObject current=null] : (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) ;
     public final EObject ruleCPBranchTransition() throws RecognitionException {
         EObject current = null;
 
@@ -4957,17 +4957,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1986:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1987:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
+            // InternalFSM.g:1988:28: ( (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' ) )
+            // InternalFSM.g:1989:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1987:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1987:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}'
+            // InternalFSM.g:1989:1: (otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}' )
+            // InternalFSM.g:1989:3: otherlv_0= 'Transition' ( (lv_name_1_0= RULE_ID ) )? otherlv_2= ':' ( (lv_from_3_0= ruleTransitionTerminal ) ) otherlv_4= '->' ( (lv_to_5_0= ruleTransitionTerminal ) ) ( (lv_docu_6_0= ruleDocumentation ) )? otherlv_7= '{' otherlv_8= 'cond' ( (lv_condition_9_0= ruleDetailCode ) ) (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )? otherlv_12= '}'
             {
-            otherlv_0=(Token)match(input,29,FOLLOW_29_in_ruleCPBranchTransition4202); 
+            otherlv_0=(Token)match(input,29,FOLLOW_20); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getCPBranchTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1991:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalFSM.g:1993:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -4976,12 +4976,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt41) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1992:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1994:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1992:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:1993:3: lv_name_1_0= RULE_ID
+                    // InternalFSM.g:1994:1: (lv_name_1_0= RULE_ID )
+                    // InternalFSM.g:1995:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCPBranchTransition4219); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getCPBranchTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -4993,7 +4993,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -5004,20 +5004,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,30,FOLLOW_30_in_ruleCPBranchTransition4237); 
+            otherlv_2=(Token)match(input,30,FOLLOW_24); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getCPBranchTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2013:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2014:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:2015:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:2016:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2014:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2015:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalFSM.g:2016:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalFSM.g:2017:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition4258);
+            pushFollow(FOLLOW_23);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -5030,7 +5030,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -5039,20 +5039,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleCPBranchTransition4270); 
+            otherlv_4=(Token)match(input,32,FOLLOW_24); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getCPBranchTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2035:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2036:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:2037:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalFSM.g:2038:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2036:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2037:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalFSM.g:2038:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalFSM.g:2039:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition4291);
+            pushFollow(FOLLOW_16);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -5065,7 +5065,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -5074,7 +5074,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2053:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalFSM.g:2055:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -5083,15 +5083,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2054:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:2056:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2054:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2055:3: lv_docu_6_0= ruleDocumentation
+                    // InternalFSM.g:2056:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalFSM.g:2057:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleCPBranchTransition4312);
+                    pushFollow(FOLLOW_8);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -5104,7 +5104,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5116,24 +5116,24 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,15,FOLLOW_15_in_ruleCPBranchTransition4325); 
+            otherlv_7=(Token)match(input,15,FOLLOW_30); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getCPBranchTransitionAccess().getLeftCurlyBracketKeyword_7());
                 
-            otherlv_8=(Token)match(input,37,FOLLOW_37_in_ruleCPBranchTransition4337); 
+            otherlv_8=(Token)match(input,37,FOLLOW_8); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getCPBranchTransitionAccess().getCondKeyword_8());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2079:1: ( (lv_condition_9_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2080:1: (lv_condition_9_0= ruleDetailCode )
+            // InternalFSM.g:2081:1: ( (lv_condition_9_0= ruleDetailCode ) )
+            // InternalFSM.g:2082:1: (lv_condition_9_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2080:1: (lv_condition_9_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2081:3: lv_condition_9_0= ruleDetailCode
+            // InternalFSM.g:2082:1: (lv_condition_9_0= ruleDetailCode )
+            // InternalFSM.g:2083:3: lv_condition_9_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getConditionDetailCodeParserRuleCall_9_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleCPBranchTransition4358);
+            pushFollow(FOLLOW_25);
             lv_condition_9_0=ruleDetailCode();
 
             state._fsp--;
@@ -5146,7 +5146,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"condition",
                     		lv_condition_9_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -5155,7 +5155,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2097:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
+            // InternalFSM.g:2099:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -5164,22 +5164,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt43) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2097:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalFSM.g:2099:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
                     {
-                    otherlv_10=(Token)match(input,33,FOLLOW_33_in_ruleCPBranchTransition4371); 
+                    otherlv_10=(Token)match(input,33,FOLLOW_8); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getCPBranchTransitionAccess().getActionKeyword_10_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2101:1: ( (lv_action_11_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2102:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalFSM.g:2103:1: ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalFSM.g:2104:1: (lv_action_11_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2102:1: (lv_action_11_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2103:3: lv_action_11_0= ruleDetailCode
+                    // InternalFSM.g:2104:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalFSM.g:2105:3: lv_action_11_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleCPBranchTransition4392);
+                    pushFollow(FOLLOW_15);
                     lv_action_11_0=ruleDetailCode();
 
                     state._fsp--;
@@ -5192,7 +5192,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"action",
                             		lv_action_11_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5207,7 +5207,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,16,FOLLOW_16_in_ruleCPBranchTransition4406); 
+            otherlv_12=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getCPBranchTransitionAccess().getRightCurlyBracketKeyword_11());
                 
@@ -5232,7 +5232,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefinedTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2131:1: entryRuleRefinedTransition returns [EObject current=null] : iv_ruleRefinedTransition= ruleRefinedTransition EOF ;
+    // InternalFSM.g:2133:1: entryRuleRefinedTransition returns [EObject current=null] : iv_ruleRefinedTransition= ruleRefinedTransition EOF ;
     public final EObject entryRuleRefinedTransition() throws RecognitionException {
         EObject current = null;
 
@@ -5240,17 +5240,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2132:2: (iv_ruleRefinedTransition= ruleRefinedTransition EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2133:2: iv_ruleRefinedTransition= ruleRefinedTransition EOF
+            // InternalFSM.g:2134:2: (iv_ruleRefinedTransition= ruleRefinedTransition EOF )
+            // InternalFSM.g:2135:2: iv_ruleRefinedTransition= ruleRefinedTransition EOF
             {
              newCompositeNode(grammarAccess.getRefinedTransitionRule()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition4442);
+            pushFollow(FOLLOW_1);
             iv_ruleRefinedTransition=ruleRefinedTransition();
 
             state._fsp--;
 
              current =iv_ruleRefinedTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedTransition4452); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5268,7 +5268,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefinedTransition"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2140:1: ruleRefinedTransition returns [EObject current=null] : (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' ) ;
+    // InternalFSM.g:2142:1: ruleRefinedTransition returns [EObject current=null] : (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' ) ;
     public final EObject ruleRefinedTransition() throws RecognitionException {
         EObject current = null;
 
@@ -5284,21 +5284,21 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2143:28: ( (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2144:1: (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' )
+            // InternalFSM.g:2145:28: ( (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' ) )
+            // InternalFSM.g:2146:1: (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2144:1: (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2144:3: otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}'
+            // InternalFSM.g:2146:1: (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' )
+            // InternalFSM.g:2146:3: otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}'
             {
-            otherlv_0=(Token)match(input,38,FOLLOW_38_in_ruleRefinedTransition4489); 
+            otherlv_0=(Token)match(input,38,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRefinedTransitionAccess().getRefinedTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2148:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2149:1: ( ruleFQN )
+            // InternalFSM.g:2150:1: ( ( ruleFQN ) )
+            // InternalFSM.g:2151:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2149:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2150:3: ruleFQN
+            // InternalFSM.g:2151:1: ( ruleFQN )
+            // InternalFSM.g:2152:3: ruleFQN
             {
 
             			if (current==null) {
@@ -5308,7 +5308,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getRefinedTransitionAccess().getTargetTransitionCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleRefinedTransition4512);
+            pushFollow(FOLLOW_16);
             ruleFQN();
 
             state._fsp--;
@@ -5322,7 +5322,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2163:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalFSM.g:2165:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -5331,15 +5331,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2164:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:2166:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2164:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2165:3: lv_docu_2_0= ruleDocumentation
+                    // InternalFSM.g:2166:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalFSM.g:2167:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedTransitionAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleRefinedTransition4533);
+                    pushFollow(FOLLOW_8);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -5352,7 +5352,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5364,24 +5364,24 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,15,FOLLOW_15_in_ruleRefinedTransition4546); 
+            otherlv_3=(Token)match(input,15,FOLLOW_31); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRefinedTransitionAccess().getLeftCurlyBracketKeyword_3());
                 
-            otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleRefinedTransition4558); 
+            otherlv_4=(Token)match(input,33,FOLLOW_8); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getRefinedTransitionAccess().getActionKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2189:1: ( (lv_action_5_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2190:1: (lv_action_5_0= ruleDetailCode )
+            // InternalFSM.g:2191:1: ( (lv_action_5_0= ruleDetailCode ) )
+            // InternalFSM.g:2192:1: (lv_action_5_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2190:1: (lv_action_5_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2191:3: lv_action_5_0= ruleDetailCode
+            // InternalFSM.g:2192:1: (lv_action_5_0= ruleDetailCode )
+            // InternalFSM.g:2193:3: lv_action_5_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getRefinedTransitionAccess().getActionDetailCodeParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedTransition4579);
+            pushFollow(FOLLOW_15);
             lv_action_5_0=ruleDetailCode();
 
             state._fsp--;
@@ -5394,7 +5394,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"action",
                     		lv_action_5_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -5403,7 +5403,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,16,FOLLOW_16_in_ruleRefinedTransition4591); 
+            otherlv_6=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getRefinedTransitionAccess().getRightCurlyBracketKeyword_6());
                 
@@ -5428,7 +5428,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransitionTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2219:1: entryRuleTransitionTerminal returns [EObject current=null] : iv_ruleTransitionTerminal= ruleTransitionTerminal EOF ;
+    // InternalFSM.g:2221:1: entryRuleTransitionTerminal returns [EObject current=null] : iv_ruleTransitionTerminal= ruleTransitionTerminal EOF ;
     public final EObject entryRuleTransitionTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5436,17 +5436,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2220:2: (iv_ruleTransitionTerminal= ruleTransitionTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2221:2: iv_ruleTransitionTerminal= ruleTransitionTerminal EOF
+            // InternalFSM.g:2222:2: (iv_ruleTransitionTerminal= ruleTransitionTerminal EOF )
+            // InternalFSM.g:2223:2: iv_ruleTransitionTerminal= ruleTransitionTerminal EOF
             {
              newCompositeNode(grammarAccess.getTransitionTerminalRule()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal4627);
+            pushFollow(FOLLOW_1);
             iv_ruleTransitionTerminal=ruleTransitionTerminal();
 
             state._fsp--;
 
              current =iv_ruleTransitionTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionTerminal4637); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5464,7 +5464,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransitionTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2228:1: ruleTransitionTerminal returns [EObject current=null] : (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) ;
+    // InternalFSM.g:2230:1: ruleTransitionTerminal returns [EObject current=null] : (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) ;
     public final EObject ruleTransitionTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5480,10 +5480,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2231:28: ( (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2232:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
+            // InternalFSM.g:2233:28: ( (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) )
+            // InternalFSM.g:2234:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2232:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
+            // InternalFSM.g:2234:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
             int alt45=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -5523,12 +5523,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt45) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2233:5: this_StateTerminal_0= ruleStateTerminal
+                    // InternalFSM.g:2235:5: this_StateTerminal_0= ruleStateTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getStateTerminalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleStateTerminal_in_ruleTransitionTerminal4684);
+                    pushFollow(FOLLOW_2);
                     this_StateTerminal_0=ruleStateTerminal();
 
                     state._fsp--;
@@ -5541,12 +5541,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2243:5: this_TrPointTerminal_1= ruleTrPointTerminal
+                    // InternalFSM.g:2245:5: this_TrPointTerminal_1= ruleTrPointTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getTrPointTerminalParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleTrPointTerminal_in_ruleTransitionTerminal4711);
+                    pushFollow(FOLLOW_2);
                     this_TrPointTerminal_1=ruleTrPointTerminal();
 
                     state._fsp--;
@@ -5559,12 +5559,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2253:5: this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal
+                    // InternalFSM.g:2255:5: this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getSubStateTrPointTerminalParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_ruleTransitionTerminal4738);
+                    pushFollow(FOLLOW_2);
                     this_SubStateTrPointTerminal_2=ruleSubStateTrPointTerminal();
 
                     state._fsp--;
@@ -5577,12 +5577,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2263:5: this_ChoicepointTerminal_3= ruleChoicepointTerminal
+                    // InternalFSM.g:2265:5: this_ChoicepointTerminal_3= ruleChoicepointTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getChoicepointTerminalParserRuleCall_3()); 
                         
-                    pushFollow(FOLLOW_ruleChoicepointTerminal_in_ruleTransitionTerminal4765);
+                    pushFollow(FOLLOW_2);
                     this_ChoicepointTerminal_3=ruleChoicepointTerminal();
 
                     state._fsp--;
@@ -5615,7 +5615,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2279:1: entryRuleStateTerminal returns [EObject current=null] : iv_ruleStateTerminal= ruleStateTerminal EOF ;
+    // InternalFSM.g:2281:1: entryRuleStateTerminal returns [EObject current=null] : iv_ruleStateTerminal= ruleStateTerminal EOF ;
     public final EObject entryRuleStateTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5623,17 +5623,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2280:2: (iv_ruleStateTerminal= ruleStateTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2281:2: iv_ruleStateTerminal= ruleStateTerminal EOF
+            // InternalFSM.g:2282:2: (iv_ruleStateTerminal= ruleStateTerminal EOF )
+            // InternalFSM.g:2283:2: iv_ruleStateTerminal= ruleStateTerminal EOF
             {
              newCompositeNode(grammarAccess.getStateTerminalRule()); 
-            pushFollow(FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal4800);
+            pushFollow(FOLLOW_1);
             iv_ruleStateTerminal=ruleStateTerminal();
 
             state._fsp--;
 
              current =iv_ruleStateTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateTerminal4810); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5651,7 +5651,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2288:1: ruleStateTerminal returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
+    // InternalFSM.g:2290:1: ruleStateTerminal returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
     public final EObject ruleStateTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5660,21 +5660,21 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2291:28: ( ( (otherlv_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2292:1: ( (otherlv_0= RULE_ID ) )
+            // InternalFSM.g:2293:28: ( ( (otherlv_0= RULE_ID ) ) )
+            // InternalFSM.g:2294:1: ( (otherlv_0= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2292:1: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2293:1: (otherlv_0= RULE_ID )
+            // InternalFSM.g:2294:1: ( (otherlv_0= RULE_ID ) )
+            // InternalFSM.g:2295:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2293:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2294:3: otherlv_0= RULE_ID
+            // InternalFSM.g:2295:1: (otherlv_0= RULE_ID )
+            // InternalFSM.g:2296:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getStateTerminalRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleStateTerminal4854); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_0, grammarAccess.getStateTerminalAccess().getStateStateCrossReference_0()); 
             	
@@ -5702,7 +5702,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2313:1: entryRuleTrPointTerminal returns [EObject current=null] : iv_ruleTrPointTerminal= ruleTrPointTerminal EOF ;
+    // InternalFSM.g:2315:1: entryRuleTrPointTerminal returns [EObject current=null] : iv_ruleTrPointTerminal= ruleTrPointTerminal EOF ;
     public final EObject entryRuleTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5710,17 +5710,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2314:2: (iv_ruleTrPointTerminal= ruleTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2315:2: iv_ruleTrPointTerminal= ruleTrPointTerminal EOF
+            // InternalFSM.g:2316:2: (iv_ruleTrPointTerminal= ruleTrPointTerminal EOF )
+            // InternalFSM.g:2317:2: iv_ruleTrPointTerminal= ruleTrPointTerminal EOF
             {
              newCompositeNode(grammarAccess.getTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal4889);
+            pushFollow(FOLLOW_1);
             iv_ruleTrPointTerminal=ruleTrPointTerminal();
 
             state._fsp--;
 
              current =iv_ruleTrPointTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPointTerminal4899); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5738,7 +5738,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2322:1: ruleTrPointTerminal returns [EObject current=null] : (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalFSM.g:2324:1: ruleTrPointTerminal returns [EObject current=null] : (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5748,28 +5748,28 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2325:28: ( (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2326:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
+            // InternalFSM.g:2327:28: ( (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalFSM.g:2328:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2326:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2326:3: otherlv_0= 'my' ( (otherlv_1= RULE_ID ) )
+            // InternalFSM.g:2328:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
+            // InternalFSM.g:2328:3: otherlv_0= 'my' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,39,FOLLOW_39_in_ruleTrPointTerminal4936); 
+            otherlv_0=(Token)match(input,39,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTrPointTerminalAccess().getMyKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2330:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2331:1: (otherlv_1= RULE_ID )
+            // InternalFSM.g:2332:1: ( (otherlv_1= RULE_ID ) )
+            // InternalFSM.g:2333:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2331:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2332:3: otherlv_1= RULE_ID
+            // InternalFSM.g:2333:1: (otherlv_1= RULE_ID )
+            // InternalFSM.g:2334:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getTrPointTerminalRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTrPointTerminal4956); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getTrPointTerminalAccess().getTrPointTrPointCrossReference_1_0()); 
             	
@@ -5800,7 +5800,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2351:1: entryRuleSubStateTrPointTerminal returns [EObject current=null] : iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF ;
+    // InternalFSM.g:2353:1: entryRuleSubStateTrPointTerminal returns [EObject current=null] : iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF ;
     public final EObject entryRuleSubStateTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5808,17 +5808,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2352:2: (iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2353:2: iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF
+            // InternalFSM.g:2354:2: (iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF )
+            // InternalFSM.g:2355:2: iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF
             {
              newCompositeNode(grammarAccess.getSubStateTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal4992);
+            pushFollow(FOLLOW_1);
             iv_ruleSubStateTrPointTerminal=ruleSubStateTrPointTerminal();
 
             state._fsp--;
 
              current =iv_ruleSubStateTrPointTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal5002); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5836,7 +5836,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2360:1: ruleSubStateTrPointTerminal returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalFSM.g:2362:1: ruleSubStateTrPointTerminal returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleSubStateTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5847,24 +5847,24 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2363:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2364:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
+            // InternalFSM.g:2365:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalFSM.g:2366:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2364:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2364:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) )
+            // InternalFSM.g:2366:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
+            // InternalFSM.g:2366:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2364:2: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2365:1: (otherlv_0= RULE_ID )
+            // InternalFSM.g:2366:2: ( (otherlv_0= RULE_ID ) )
+            // InternalFSM.g:2367:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2365:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2366:3: otherlv_0= RULE_ID
+            // InternalFSM.g:2367:1: (otherlv_0= RULE_ID )
+            // InternalFSM.g:2368:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSubStateTrPointTerminalRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal5047); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_32); 
 
             		newLeafNode(otherlv_0, grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointCrossReference_0_0()); 
             	
@@ -5874,22 +5874,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,40,FOLLOW_40_in_ruleSubStateTrPointTerminal5059); 
+            otherlv_1=(Token)match(input,40,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getSubStateTrPointTerminalAccess().getOfKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2381:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2382:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2383:1: ( (otherlv_2= RULE_ID ) )
+            // InternalFSM.g:2384:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2382:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2383:3: otherlv_2= RULE_ID
+            // InternalFSM.g:2384:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2385:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSubStateTrPointTerminalRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal5079); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getSubStateTrPointTerminalAccess().getStateStateCrossReference_2_0()); 
             	
@@ -5920,7 +5920,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2402:1: entryRuleChoicepointTerminal returns [EObject current=null] : iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF ;
+    // InternalFSM.g:2404:1: entryRuleChoicepointTerminal returns [EObject current=null] : iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF ;
     public final EObject entryRuleChoicepointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5928,17 +5928,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2403:2: (iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2404:2: iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF
+            // InternalFSM.g:2405:2: (iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF )
+            // InternalFSM.g:2406:2: iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF
             {
              newCompositeNode(grammarAccess.getChoicepointTerminalRule()); 
-            pushFollow(FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal5115);
+            pushFollow(FOLLOW_1);
             iv_ruleChoicepointTerminal=ruleChoicepointTerminal();
 
             state._fsp--;
 
              current =iv_ruleChoicepointTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicepointTerminal5125); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5956,7 +5956,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2411:1: ruleChoicepointTerminal returns [EObject current=null] : (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalFSM.g:2413:1: ruleChoicepointTerminal returns [EObject current=null] : (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleChoicepointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -5966,28 +5966,28 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2414:28: ( (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2415:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
+            // InternalFSM.g:2416:28: ( (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalFSM.g:2417:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2415:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2415:3: otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) )
+            // InternalFSM.g:2417:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
+            // InternalFSM.g:2417:3: otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,41,FOLLOW_41_in_ruleChoicepointTerminal5162); 
+            otherlv_0=(Token)match(input,41,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getChoicepointTerminalAccess().getCpKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2419:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2420:1: (otherlv_1= RULE_ID )
+            // InternalFSM.g:2421:1: ( (otherlv_1= RULE_ID ) )
+            // InternalFSM.g:2422:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2420:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2421:3: otherlv_1= RULE_ID
+            // InternalFSM.g:2422:1: (otherlv_1= RULE_ID )
+            // InternalFSM.g:2423:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getChoicepointTerminalRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleChoicepointTerminal5182); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getChoicepointTerminalAccess().getCpChoicePointCrossReference_1_0()); 
             	
@@ -6018,7 +6018,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTrigger"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2440:1: entryRuleTrigger returns [EObject current=null] : iv_ruleTrigger= ruleTrigger EOF ;
+    // InternalFSM.g:2442:1: entryRuleTrigger returns [EObject current=null] : iv_ruleTrigger= ruleTrigger EOF ;
     public final EObject entryRuleTrigger() throws RecognitionException {
         EObject current = null;
 
@@ -6026,17 +6026,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2441:2: (iv_ruleTrigger= ruleTrigger EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2442:2: iv_ruleTrigger= ruleTrigger EOF
+            // InternalFSM.g:2443:2: (iv_ruleTrigger= ruleTrigger EOF )
+            // InternalFSM.g:2444:2: iv_ruleTrigger= ruleTrigger EOF
             {
              newCompositeNode(grammarAccess.getTriggerRule()); 
-            pushFollow(FOLLOW_ruleTrigger_in_entryRuleTrigger5218);
+            pushFollow(FOLLOW_1);
             iv_ruleTrigger=ruleTrigger();
 
             state._fsp--;
 
              current =iv_ruleTrigger; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrigger5228); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6054,7 +6054,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrigger"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2449:1: ruleTrigger returns [EObject current=null] : (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' ) ;
+    // InternalFSM.g:2451:1: ruleTrigger returns [EObject current=null] : (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' ) ;
     public final EObject ruleTrigger() throws RecognitionException {
         EObject current = null;
 
@@ -6071,26 +6071,26 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2452:28: ( (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2453:1: (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' )
+            // InternalFSM.g:2454:28: ( (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' ) )
+            // InternalFSM.g:2455:1: (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2453:1: (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2453:3: otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>'
+            // InternalFSM.g:2455:1: (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' )
+            // InternalFSM.g:2455:3: otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>'
             {
-            otherlv_0=(Token)match(input,42,FOLLOW_42_in_ruleTrigger5265); 
+            otherlv_0=(Token)match(input,42,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTriggerAccess().getLessThanSignKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2457:1: ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2458:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
+            // InternalFSM.g:2459:1: ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) )
+            // InternalFSM.g:2460:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2458:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2459:3: lv_msgFromIfPairs_1_0= ruleMessageFromIf
+            // InternalFSM.g:2460:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
+            // InternalFSM.g:2461:3: lv_msgFromIfPairs_1_0= ruleMessageFromIf
             {
              
             	        newCompositeNode(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleMessageFromIf_in_ruleTrigger5286);
+            pushFollow(FOLLOW_33);
             lv_msgFromIfPairs_1_0=ruleMessageFromIf();
 
             state._fsp--;
@@ -6103,7 +6103,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"msgFromIfPairs",
                     		lv_msgFromIfPairs_1_0, 
-                    		"MessageFromIf");
+                    		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -6112,7 +6112,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2475:2: (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )*
+            // InternalFSM.g:2477:2: (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )*
             loop46:
             do {
                 int alt46=2;
@@ -6125,22 +6125,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt46) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2475:4: otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
+            	    // InternalFSM.g:2477:4: otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
             	    {
-            	    otherlv_2=(Token)match(input,43,FOLLOW_43_in_ruleTrigger5299); 
+            	    otherlv_2=(Token)match(input,43,FOLLOW_5); 
 
             	        	newLeafNode(otherlv_2, grammarAccess.getTriggerAccess().getVerticalLineKeyword_2_0());
             	        
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2479:1: ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2480:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
+            	    // InternalFSM.g:2481:1: ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
+            	    // InternalFSM.g:2482:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2480:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2481:3: lv_msgFromIfPairs_3_0= ruleMessageFromIf
+            	    // InternalFSM.g:2482:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
+            	    // InternalFSM.g:2483:3: lv_msgFromIfPairs_3_0= ruleMessageFromIf
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_2_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleMessageFromIf_in_ruleTrigger5320);
+            	    pushFollow(FOLLOW_33);
             	    lv_msgFromIfPairs_3_0=ruleMessageFromIf();
 
             	    state._fsp--;
@@ -6153,7 +6153,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"msgFromIfPairs",
             	            		lv_msgFromIfPairs_3_0, 
-            	            		"MessageFromIf");
+            	            		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -6171,7 +6171,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2497:4: ( (lv_guard_4_0= ruleGuard ) )?
+            // InternalFSM.g:2499:4: ( (lv_guard_4_0= ruleGuard ) )?
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -6180,15 +6180,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt47) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2498:1: (lv_guard_4_0= ruleGuard )
+                    // InternalFSM.g:2500:1: (lv_guard_4_0= ruleGuard )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2498:1: (lv_guard_4_0= ruleGuard )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2499:3: lv_guard_4_0= ruleGuard
+                    // InternalFSM.g:2500:1: (lv_guard_4_0= ruleGuard )
+                    // InternalFSM.g:2501:3: lv_guard_4_0= ruleGuard
                     {
                      
                     	        newCompositeNode(grammarAccess.getTriggerAccess().getGuardGuardParserRuleCall_3_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleGuard_in_ruleTrigger5343);
+                    pushFollow(FOLLOW_34);
                     lv_guard_4_0=ruleGuard();
 
                     state._fsp--;
@@ -6201,7 +6201,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"guard",
                             		lv_guard_4_0, 
-                            		"Guard");
+                            		"org.eclipse.etrice.core.fsm.FSM.Guard");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -6213,7 +6213,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,44,FOLLOW_44_in_ruleTrigger5356); 
+            otherlv_5=(Token)match(input,44,FOLLOW_2); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getTriggerAccess().getGreaterThanSignKeyword_4());
                 
@@ -6238,7 +6238,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMessageFromIf"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2527:1: entryRuleMessageFromIf returns [EObject current=null] : iv_ruleMessageFromIf= ruleMessageFromIf EOF ;
+    // InternalFSM.g:2529:1: entryRuleMessageFromIf returns [EObject current=null] : iv_ruleMessageFromIf= ruleMessageFromIf EOF ;
     public final EObject entryRuleMessageFromIf() throws RecognitionException {
         EObject current = null;
 
@@ -6246,17 +6246,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2528:2: (iv_ruleMessageFromIf= ruleMessageFromIf EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2529:2: iv_ruleMessageFromIf= ruleMessageFromIf EOF
+            // InternalFSM.g:2530:2: (iv_ruleMessageFromIf= ruleMessageFromIf EOF )
+            // InternalFSM.g:2531:2: iv_ruleMessageFromIf= ruleMessageFromIf EOF
             {
              newCompositeNode(grammarAccess.getMessageFromIfRule()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf5392);
+            pushFollow(FOLLOW_1);
             iv_ruleMessageFromIf=ruleMessageFromIf();
 
             state._fsp--;
 
              current =iv_ruleMessageFromIf; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageFromIf5402); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6274,7 +6274,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessageFromIf"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2536:1: ruleMessageFromIf returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalFSM.g:2538:1: ruleMessageFromIf returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleMessageFromIf() throws RecognitionException {
         EObject current = null;
 
@@ -6285,24 +6285,24 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2539:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2540:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
+            // InternalFSM.g:2541:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalFSM.g:2542:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2540:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2540:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) )
+            // InternalFSM.g:2542:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
+            // InternalFSM.g:2542:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2540:2: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2541:1: (otherlv_0= RULE_ID )
+            // InternalFSM.g:2542:2: ( (otherlv_0= RULE_ID ) )
+            // InternalFSM.g:2543:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2541:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2542:3: otherlv_0= RULE_ID
+            // InternalFSM.g:2543:1: (otherlv_0= RULE_ID )
+            // InternalFSM.g:2544:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getMessageFromIfRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessageFromIf5447); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
             		newLeafNode(otherlv_0, grammarAccess.getMessageFromIfAccess().getMessageEObjectCrossReference_0_0()); 
             	
@@ -6312,22 +6312,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,30,FOLLOW_30_in_ruleMessageFromIf5459); 
+            otherlv_1=(Token)match(input,30,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getMessageFromIfAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2557:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2558:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2559:1: ( (otherlv_2= RULE_ID ) )
+            // InternalFSM.g:2560:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2558:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2559:3: otherlv_2= RULE_ID
+            // InternalFSM.g:2560:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2561:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getMessageFromIfRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessageFromIf5479); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemCrossReference_2_0()); 
             	
@@ -6358,7 +6358,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleGuard"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2580:1: entryRuleGuard returns [EObject current=null] : iv_ruleGuard= ruleGuard EOF ;
+    // InternalFSM.g:2582:1: entryRuleGuard returns [EObject current=null] : iv_ruleGuard= ruleGuard EOF ;
     public final EObject entryRuleGuard() throws RecognitionException {
         EObject current = null;
 
@@ -6366,17 +6366,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2581:2: (iv_ruleGuard= ruleGuard EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2582:2: iv_ruleGuard= ruleGuard EOF
+            // InternalFSM.g:2583:2: (iv_ruleGuard= ruleGuard EOF )
+            // InternalFSM.g:2584:2: iv_ruleGuard= ruleGuard EOF
             {
              newCompositeNode(grammarAccess.getGuardRule()); 
-            pushFollow(FOLLOW_ruleGuard_in_entryRuleGuard5517);
+            pushFollow(FOLLOW_1);
             iv_ruleGuard=ruleGuard();
 
             state._fsp--;
 
              current =iv_ruleGuard; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuard5527); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6394,7 +6394,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGuard"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2589:1: ruleGuard returns [EObject current=null] : (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) ;
+    // InternalFSM.g:2591:1: ruleGuard returns [EObject current=null] : (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) ;
     public final EObject ruleGuard() throws RecognitionException {
         EObject current = null;
 
@@ -6405,26 +6405,26 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2592:28: ( (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2593:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
+            // InternalFSM.g:2594:28: ( (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) )
+            // InternalFSM.g:2595:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2593:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2593:3: otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) )
+            // InternalFSM.g:2595:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
+            // InternalFSM.g:2595:3: otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) )
             {
-            otherlv_0=(Token)match(input,36,FOLLOW_36_in_ruleGuard5564); 
+            otherlv_0=(Token)match(input,36,FOLLOW_8); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getGuardAccess().getGuardKeyword_0());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2597:1: ( (lv_guard_1_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2598:1: (lv_guard_1_0= ruleDetailCode )
+            // InternalFSM.g:2599:1: ( (lv_guard_1_0= ruleDetailCode ) )
+            // InternalFSM.g:2600:1: (lv_guard_1_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2598:1: (lv_guard_1_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2599:3: lv_guard_1_0= ruleDetailCode
+            // InternalFSM.g:2600:1: (lv_guard_1_0= ruleDetailCode )
+            // InternalFSM.g:2601:3: lv_guard_1_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getGuardAccess().getGuardDetailCodeParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleGuard5585);
+            pushFollow(FOLLOW_2);
             lv_guard_1_0=ruleDetailCode();
 
             state._fsp--;
@@ -6437,7 +6437,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"guard",
                     		lv_guard_1_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -6467,7 +6467,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2625:1: entryRuleSemanticsRule returns [EObject current=null] : iv_ruleSemanticsRule= ruleSemanticsRule EOF ;
+    // InternalFSM.g:2627:1: entryRuleSemanticsRule returns [EObject current=null] : iv_ruleSemanticsRule= ruleSemanticsRule EOF ;
     public final EObject entryRuleSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -6475,17 +6475,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2626:2: (iv_ruleSemanticsRule= ruleSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2627:2: iv_ruleSemanticsRule= ruleSemanticsRule EOF
+            // InternalFSM.g:2628:2: (iv_ruleSemanticsRule= ruleSemanticsRule EOF )
+            // InternalFSM.g:2629:2: iv_ruleSemanticsRule= ruleSemanticsRule EOF
             {
              newCompositeNode(grammarAccess.getSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule5623);
+            pushFollow(FOLLOW_1);
             iv_ruleSemanticsRule=ruleSemanticsRule();
 
             state._fsp--;
 
              current =iv_ruleSemanticsRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSemanticsRule5633); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6503,7 +6503,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2634:1: ruleSemanticsRule returns [EObject current=null] : (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) ;
+    // InternalFSM.g:2636:1: ruleSemanticsRule returns [EObject current=null] : (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) ;
     public final EObject ruleSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -6515,10 +6515,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2637:28: ( (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2638:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
+            // InternalFSM.g:2639:28: ( (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) )
+            // InternalFSM.g:2640:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2638:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
+            // InternalFSM.g:2640:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -6536,12 +6536,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt48) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2639:5: this_InSemanticsRule_0= ruleInSemanticsRule
+                    // InternalFSM.g:2641:5: this_InSemanticsRule_0= ruleInSemanticsRule
                     {
                      
                             newCompositeNode(grammarAccess.getSemanticsRuleAccess().getInSemanticsRuleParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleInSemanticsRule_in_ruleSemanticsRule5680);
+                    pushFollow(FOLLOW_2);
                     this_InSemanticsRule_0=ruleInSemanticsRule();
 
                     state._fsp--;
@@ -6554,12 +6554,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2649:5: this_OutSemanticsRule_1= ruleOutSemanticsRule
+                    // InternalFSM.g:2651:5: this_OutSemanticsRule_1= ruleOutSemanticsRule
                     {
                      
                             newCompositeNode(grammarAccess.getSemanticsRuleAccess().getOutSemanticsRuleParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleOutSemanticsRule_in_ruleSemanticsRule5707);
+                    pushFollow(FOLLOW_2);
                     this_OutSemanticsRule_1=ruleOutSemanticsRule();
 
                     state._fsp--;
@@ -6592,7 +6592,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2665:1: entryRuleInSemanticsRule returns [EObject current=null] : iv_ruleInSemanticsRule= ruleInSemanticsRule EOF ;
+    // InternalFSM.g:2667:1: entryRuleInSemanticsRule returns [EObject current=null] : iv_ruleInSemanticsRule= ruleInSemanticsRule EOF ;
     public final EObject entryRuleInSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -6600,17 +6600,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2666:2: (iv_ruleInSemanticsRule= ruleInSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2667:2: iv_ruleInSemanticsRule= ruleInSemanticsRule EOF
+            // InternalFSM.g:2668:2: (iv_ruleInSemanticsRule= ruleInSemanticsRule EOF )
+            // InternalFSM.g:2669:2: iv_ruleInSemanticsRule= ruleInSemanticsRule EOF
             {
              newCompositeNode(grammarAccess.getInSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule5742);
+            pushFollow(FOLLOW_1);
             iv_ruleInSemanticsRule=ruleInSemanticsRule();
 
             state._fsp--;
 
              current =iv_ruleInSemanticsRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInSemanticsRule5752); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6628,7 +6628,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2674:1: ruleInSemanticsRule returns [EObject current=null] : (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) ;
+    // InternalFSM.g:2676:1: ruleInSemanticsRule returns [EObject current=null] : (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) ;
     public final EObject ruleInSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -6649,32 +6649,32 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2677:28: ( (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2678:1: (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
+            // InternalFSM.g:2679:28: ( (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) )
+            // InternalFSM.g:2680:1: (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2678:1: (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2678:3: otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
+            // InternalFSM.g:2680:1: (otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
+            // InternalFSM.g:2680:3: otherlv_0= 'in' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
             {
-            otherlv_0=(Token)match(input,45,FOLLOW_45_in_ruleInSemanticsRule5789); 
+            otherlv_0=(Token)match(input,45,FOLLOW_21); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getInSemanticsRuleAccess().getInKeyword_0());
                 
-            otherlv_1=(Token)match(input,30,FOLLOW_30_in_ruleInSemanticsRule5801); 
+            otherlv_1=(Token)match(input,30,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getInSemanticsRuleAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2686:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2687:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2688:1: ( (otherlv_2= RULE_ID ) )
+            // InternalFSM.g:2689:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2687:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2688:3: otherlv_2= RULE_ID
+            // InternalFSM.g:2689:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2690:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getInSemanticsRuleRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInSemanticsRule5821); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_35); 
 
             		newLeafNode(otherlv_2, grammarAccess.getInSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
             	
@@ -6684,7 +6684,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2699:2: (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
+            // InternalFSM.g:2701:2: (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
             int alt51=2;
             int LA51_0 = input.LA(1);
 
@@ -6693,13 +6693,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt51) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2699:4: otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalFSM.g:2701:4: otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
                     {
-                    otherlv_3=(Token)match(input,32,FOLLOW_32_in_ruleInSemanticsRule5834); 
+                    otherlv_3=(Token)match(input,32,FOLLOW_36); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getInSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2703:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalFSM.g:2705:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
                     int alt50=2;
                     int LA50_0 = input.LA(1);
 
@@ -6717,18 +6717,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt50) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2703:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalFSM.g:2705:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2703:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2704:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalFSM.g:2705:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalFSM.g:2706:1: (lv_followUps_4_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2704:1: (lv_followUps_4_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2705:3: lv_followUps_4_0= ruleSemanticsRule
+                            // InternalFSM.g:2706:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalFSM.g:2707:3: lv_followUps_4_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule5856);
+                            pushFollow(FOLLOW_2);
                             lv_followUps_4_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -6741,7 +6741,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_4_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -6754,25 +6754,25 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2722:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalFSM.g:2724:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2722:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2722:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
+                            // InternalFSM.g:2724:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalFSM.g:2724:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
                             {
-                            otherlv_5=(Token)match(input,46,FOLLOW_46_in_ruleInSemanticsRule5875); 
+                            otherlv_5=(Token)match(input,46,FOLLOW_37); 
 
                                 	newLeafNode(otherlv_5, grammarAccess.getInSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2726:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2727:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalFSM.g:2728:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
+                            // InternalFSM.g:2729:1: (lv_followUps_6_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2727:1: (lv_followUps_6_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2728:3: lv_followUps_6_0= ruleSemanticsRule
+                            // InternalFSM.g:2729:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalFSM.g:2730:3: lv_followUps_6_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule5896);
+                            pushFollow(FOLLOW_38);
                             lv_followUps_6_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -6785,7 +6785,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_6_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -6794,7 +6794,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2744:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
+                            // InternalFSM.g:2746:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
                             int cnt49=0;
                             loop49:
                             do {
@@ -6808,22 +6808,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                                 switch (alt49) {
                             	case 1 :
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2744:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalFSM.g:2746:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
                             	    {
-                            	    otherlv_7=(Token)match(input,47,FOLLOW_47_in_ruleInSemanticsRule5909); 
+                            	    otherlv_7=(Token)match(input,47,FOLLOW_37); 
 
                             	        	newLeafNode(otherlv_7, grammarAccess.getInSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0());
                             	        
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2748:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2749:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalFSM.g:2750:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalFSM.g:2751:1: (lv_followUps_8_0= ruleSemanticsRule )
                             	    {
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2749:1: (lv_followUps_8_0= ruleSemanticsRule )
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2750:3: lv_followUps_8_0= ruleSemanticsRule
+                            	    // InternalFSM.g:2751:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalFSM.g:2752:3: lv_followUps_8_0= ruleSemanticsRule
                             	    {
                             	     
                             	    	        newCompositeNode(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
                             	    	    
-                            	    pushFollow(FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule5930);
+                            	    pushFollow(FOLLOW_39);
                             	    lv_followUps_8_0=ruleSemanticsRule();
 
                             	    state._fsp--;
@@ -6836,7 +6836,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                             	           			current, 
                             	           			"followUps",
                             	            		lv_followUps_8_0, 
-                            	            		"SemanticsRule");
+                            	            		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	    	        afterParserOrEnumRuleCall();
                             	    	    
 
@@ -6858,7 +6858,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                 cnt49++;
                             } while (true);
 
-                            otherlv_9=(Token)match(input,48,FOLLOW_48_in_ruleInSemanticsRule5944); 
+                            otherlv_9=(Token)match(input,48,FOLLOW_2); 
 
                                 	newLeafNode(otherlv_9, grammarAccess.getInSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3());
                                 
@@ -6898,7 +6898,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2778:1: entryRuleOutSemanticsRule returns [EObject current=null] : iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF ;
+    // InternalFSM.g:2780:1: entryRuleOutSemanticsRule returns [EObject current=null] : iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF ;
     public final EObject entryRuleOutSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -6906,17 +6906,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2779:2: (iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2780:2: iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF
+            // InternalFSM.g:2781:2: (iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF )
+            // InternalFSM.g:2782:2: iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF
             {
              newCompositeNode(grammarAccess.getOutSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule5984);
+            pushFollow(FOLLOW_1);
             iv_ruleOutSemanticsRule=ruleOutSemanticsRule();
 
             state._fsp--;
 
              current =iv_ruleOutSemanticsRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutSemanticsRule5994); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6934,7 +6934,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2787:1: ruleOutSemanticsRule returns [EObject current=null] : (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) ;
+    // InternalFSM.g:2789:1: ruleOutSemanticsRule returns [EObject current=null] : (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) ;
     public final EObject ruleOutSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -6955,32 +6955,32 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2790:28: ( (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2791:1: (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
+            // InternalFSM.g:2792:28: ( (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? ) )
+            // InternalFSM.g:2793:1: (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2791:1: (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2791:3: otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
+            // InternalFSM.g:2793:1: (otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )? )
+            // InternalFSM.g:2793:3: otherlv_0= 'out' otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
             {
-            otherlv_0=(Token)match(input,49,FOLLOW_49_in_ruleOutSemanticsRule6031); 
+            otherlv_0=(Token)match(input,49,FOLLOW_21); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getOutSemanticsRuleAccess().getOutKeyword_0());
                 
-            otherlv_1=(Token)match(input,30,FOLLOW_30_in_ruleOutSemanticsRule6043); 
+            otherlv_1=(Token)match(input,30,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getOutSemanticsRuleAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2799:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2800:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2801:1: ( (otherlv_2= RULE_ID ) )
+            // InternalFSM.g:2802:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2800:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2801:3: otherlv_2= RULE_ID
+            // InternalFSM.g:2802:1: (otherlv_2= RULE_ID )
+            // InternalFSM.g:2803:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getOutSemanticsRuleRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOutSemanticsRule6063); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_35); 
 
             		newLeafNode(otherlv_2, grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
             	
@@ -6990,7 +6990,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2812:2: (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
+            // InternalFSM.g:2814:2: (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
             int alt54=2;
             int LA54_0 = input.LA(1);
 
@@ -6999,13 +6999,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt54) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2812:4: otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalFSM.g:2814:4: otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
                     {
-                    otherlv_3=(Token)match(input,32,FOLLOW_32_in_ruleOutSemanticsRule6076); 
+                    otherlv_3=(Token)match(input,32,FOLLOW_36); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getOutSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2816:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalFSM.g:2818:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
                     int alt53=2;
                     int LA53_0 = input.LA(1);
 
@@ -7023,18 +7023,18 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt53) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2816:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalFSM.g:2818:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2816:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2817:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalFSM.g:2818:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalFSM.g:2819:1: (lv_followUps_4_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2817:1: (lv_followUps_4_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2818:3: lv_followUps_4_0= ruleSemanticsRule
+                            // InternalFSM.g:2819:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalFSM.g:2820:3: lv_followUps_4_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule6098);
+                            pushFollow(FOLLOW_2);
                             lv_followUps_4_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -7047,7 +7047,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_4_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -7060,25 +7060,25 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2835:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalFSM.g:2837:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2835:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2835:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
+                            // InternalFSM.g:2837:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalFSM.g:2837:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
                             {
-                            otherlv_5=(Token)match(input,46,FOLLOW_46_in_ruleOutSemanticsRule6117); 
+                            otherlv_5=(Token)match(input,46,FOLLOW_37); 
 
                                 	newLeafNode(otherlv_5, grammarAccess.getOutSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0());
                                 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2839:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2840:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalFSM.g:2841:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
+                            // InternalFSM.g:2842:1: (lv_followUps_6_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2840:1: (lv_followUps_6_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2841:3: lv_followUps_6_0= ruleSemanticsRule
+                            // InternalFSM.g:2842:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalFSM.g:2843:3: lv_followUps_6_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule6138);
+                            pushFollow(FOLLOW_38);
                             lv_followUps_6_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -7091,7 +7091,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_6_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -7100,7 +7100,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2857:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
+                            // InternalFSM.g:2859:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
                             int cnt52=0;
                             loop52:
                             do {
@@ -7114,22 +7114,22 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                                 switch (alt52) {
                             	case 1 :
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2857:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalFSM.g:2859:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
                             	    {
-                            	    otherlv_7=(Token)match(input,47,FOLLOW_47_in_ruleOutSemanticsRule6151); 
+                            	    otherlv_7=(Token)match(input,47,FOLLOW_37); 
 
                             	        	newLeafNode(otherlv_7, grammarAccess.getOutSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0());
                             	        
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2861:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2862:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalFSM.g:2863:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalFSM.g:2864:1: (lv_followUps_8_0= ruleSemanticsRule )
                             	    {
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2862:1: (lv_followUps_8_0= ruleSemanticsRule )
-                            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2863:3: lv_followUps_8_0= ruleSemanticsRule
+                            	    // InternalFSM.g:2864:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalFSM.g:2865:3: lv_followUps_8_0= ruleSemanticsRule
                             	    {
                             	     
                             	    	        newCompositeNode(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
                             	    	    
-                            	    pushFollow(FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule6172);
+                            	    pushFollow(FOLLOW_39);
                             	    lv_followUps_8_0=ruleSemanticsRule();
 
                             	    state._fsp--;
@@ -7142,7 +7142,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                             	           			current, 
                             	           			"followUps",
                             	            		lv_followUps_8_0, 
-                            	            		"SemanticsRule");
+                            	            		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	    	        afterParserOrEnumRuleCall();
                             	    	    
 
@@ -7164,7 +7164,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                                 cnt52++;
                             } while (true);
 
-                            otherlv_9=(Token)match(input,48,FOLLOW_48_in_ruleOutSemanticsRule6186); 
+                            otherlv_9=(Token)match(input,48,FOLLOW_2); 
 
                                 	newLeafNode(otherlv_9, grammarAccess.getOutSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3());
                                 
@@ -7204,7 +7204,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2893:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalFSM.g:2895:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -7212,17 +7212,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2894:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2895:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalFSM.g:2896:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalFSM.g:2897:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
              newCompositeNode(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue6228);
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
 
              current =iv_ruleKeyValue; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue6238); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7240,7 +7240,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2902:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalFSM.g:2904:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
     public final EObject ruleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -7252,19 +7252,19 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2905:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2906:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalFSM.g:2907:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalFSM.g:2908:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2906:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2906:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalFSM.g:2908:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalFSM.g:2908:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2906:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2907:1: (lv_key_0_0= RULE_ID )
+            // InternalFSM.g:2908:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalFSM.g:2909:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2907:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2908:3: lv_key_0_0= RULE_ID
+            // InternalFSM.g:2909:1: (lv_key_0_0= RULE_ID )
+            // InternalFSM.g:2910:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue6280); 
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_40); 
 
             			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             		
@@ -7276,7 +7276,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"key",
                     		lv_key_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -7284,20 +7284,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,50,FOLLOW_50_in_ruleKeyValue6297); 
+            otherlv_1=(Token)match(input,50,FOLLOW_41); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2928:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2929:1: (lv_value_2_0= ruleLiteral )
+            // InternalFSM.g:2930:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalFSM.g:2931:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2929:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2930:3: lv_value_2_0= ruleLiteral
+            // InternalFSM.g:2931:1: (lv_value_2_0= ruleLiteral )
+            // InternalFSM.g:2932:3: lv_value_2_0= ruleLiteral
             {
              
             	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue6318);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
@@ -7310,7 +7310,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_2_0, 
-                    		"Literal");
+                    		"org.eclipse.etrice.core.common.Base.Literal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -7340,7 +7340,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2956:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalFSM.g:2958:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -7348,17 +7348,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2957:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2958:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalFSM.g:2959:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalFSM.g:2960:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType6357);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationTargetType.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType6368); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7376,7 +7376,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2965:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalFSM.g:2967:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7385,10 +7385,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2968:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2969:5: this_ID_0= RULE_ID
+            // InternalFSM.g:2970:28: (this_ID_0= RULE_ID )
+            // InternalFSM.g:2971:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType6407); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		current.merge(this_ID_0);
                 
@@ -7413,7 +7413,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2984:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalFSM.g:2986:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -7421,17 +7421,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2985:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2986:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalFSM.g:2987:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalFSM.g:2988:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute6451);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute6461); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7449,7 +7449,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2993:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalFSM.g:2995:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -7461,10 +7461,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2996:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2997:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalFSM.g:2998:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalFSM.g:2999:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2997:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalFSM.g:2999:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -7568,12 +7568,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt55) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:2998:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalFSM.g:3000:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute6508);
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -7586,12 +7586,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3008:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalFSM.g:3010:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute6535);
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -7624,7 +7624,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3024:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalFSM.g:3026:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -7632,17 +7632,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3025:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3026:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalFSM.g:3027:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalFSM.g:3028:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute6570);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleSimpleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute6580); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7660,7 +7660,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3033:1: ruleSimpleAnnotationAttribute returns [EObject current=null] : ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) ) ;
+    // InternalFSM.g:3035:1: ruleSimpleAnnotationAttribute returns [EObject current=null] : ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) ) ;
     public final EObject ruleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -7675,13 +7675,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3036:28: ( ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3037:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) )
+            // InternalFSM.g:3038:28: ( ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) ) )
+            // InternalFSM.g:3039:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3037:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3037:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalFSM.g:3039:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) ) )
+            // InternalFSM.g:3039:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' ( (lv_type_5_0= ruleLiteralType ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3037:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalFSM.g:3039:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt56=2;
             int LA56_0 = input.LA(1);
 
@@ -7699,15 +7699,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt56) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3037:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalFSM.g:3039:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3037:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3038:1: (lv_optional_0_0= 'optional' )
+                    // InternalFSM.g:3039:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalFSM.g:3040:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3038:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3039:3: lv_optional_0_0= 'optional'
+                    // InternalFSM.g:3040:1: (lv_optional_0_0= 'optional' )
+                    // InternalFSM.g:3041:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,51,FOLLOW_51_in_ruleSimpleAnnotationAttribute6624); 
+                    lv_optional_0_0=(Token)match(input,51,FOLLOW_42); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -7727,9 +7727,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3053:7: otherlv_1= 'mandatory'
+                    // InternalFSM.g:3055:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,52,FOLLOW_52_in_ruleSimpleAnnotationAttribute6655); 
+                    otherlv_1=(Token)match(input,52,FOLLOW_42); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -7739,17 +7739,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,53,FOLLOW_53_in_ruleSimpleAnnotationAttribute6668); 
+            otherlv_2=(Token)match(input,53,FOLLOW_5); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3061:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3062:1: (lv_name_3_0= RULE_ID )
+            // InternalFSM.g:3063:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalFSM.g:3064:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3062:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3063:3: lv_name_3_0= RULE_ID
+            // InternalFSM.g:3064:1: (lv_name_3_0= RULE_ID )
+            // InternalFSM.g:3065:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute6685); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -7761,7 +7761,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -7769,20 +7769,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleSimpleAnnotationAttribute6702); 
+            otherlv_4=(Token)match(input,30,FOLLOW_43); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3083:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3084:1: (lv_type_5_0= ruleLiteralType )
+            // InternalFSM.g:3085:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalFSM.g:3086:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3084:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3085:3: lv_type_5_0= ruleLiteralType
+            // InternalFSM.g:3086:1: (lv_type_5_0= ruleLiteralType )
+            // InternalFSM.g:3087:3: lv_type_5_0= ruleLiteralType
             {
              
             	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute6723);
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
@@ -7795,7 +7795,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"type",
                     		lv_type_5_0, 
-                    		"LiteralType");
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -7825,7 +7825,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3109:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalFSM.g:3111:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -7833,17 +7833,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3110:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3111:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalFSM.g:3112:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalFSM.g:3113:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute6759);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleEnumAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute6769); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7861,7 +7861,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3118:1: ruleEnumAnnotationAttribute returns [EObject current=null] : ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' ) ;
+    // InternalFSM.g:3120:1: ruleEnumAnnotationAttribute returns [EObject current=null] : ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' ) ;
     public final EObject ruleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -7879,13 +7879,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3121:28: ( ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3122:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' )
+            // InternalFSM.g:3123:28: ( ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' ) )
+            // InternalFSM.g:3124:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3122:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3122:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}'
+            // InternalFSM.g:3124:1: ( ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}' )
+            // InternalFSM.g:3124:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' ) otherlv_2= 'attribute' ( (lv_name_3_0= RULE_ID ) ) otherlv_4= ':' otherlv_5= '{' ( (lv_values_6_0= RULE_STRING ) ) (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )* otherlv_9= '}'
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3122:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalFSM.g:3124:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -7903,15 +7903,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt57) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3122:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalFSM.g:3124:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3122:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3123:1: (lv_optional_0_0= 'optional' )
+                    // InternalFSM.g:3124:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalFSM.g:3125:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3123:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3124:3: lv_optional_0_0= 'optional'
+                    // InternalFSM.g:3125:1: (lv_optional_0_0= 'optional' )
+                    // InternalFSM.g:3126:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,51,FOLLOW_51_in_ruleEnumAnnotationAttribute6813); 
+                    lv_optional_0_0=(Token)match(input,51,FOLLOW_42); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -7931,9 +7931,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3138:7: otherlv_1= 'mandatory'
+                    // InternalFSM.g:3140:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,52,FOLLOW_52_in_ruleEnumAnnotationAttribute6844); 
+                    otherlv_1=(Token)match(input,52,FOLLOW_42); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -7943,17 +7943,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,53,FOLLOW_53_in_ruleEnumAnnotationAttribute6857); 
+            otherlv_2=(Token)match(input,53,FOLLOW_5); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3146:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3147:1: (lv_name_3_0= RULE_ID )
+            // InternalFSM.g:3148:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalFSM.g:3149:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3147:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3148:3: lv_name_3_0= RULE_ID
+            // InternalFSM.g:3149:1: (lv_name_3_0= RULE_ID )
+            // InternalFSM.g:3150:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute6874); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -7965,7 +7965,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -7973,21 +7973,21 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleEnumAnnotationAttribute6891); 
+            otherlv_4=(Token)match(input,30,FOLLOW_8); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
                 
-            otherlv_5=(Token)match(input,15,FOLLOW_15_in_ruleEnumAnnotationAttribute6903); 
+            otherlv_5=(Token)match(input,15,FOLLOW_44); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3172:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3173:1: (lv_values_6_0= RULE_STRING )
+            // InternalFSM.g:3174:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalFSM.g:3175:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3173:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3174:3: lv_values_6_0= RULE_STRING
+            // InternalFSM.g:3175:1: (lv_values_6_0= RULE_STRING )
+            // InternalFSM.g:3176:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute6920); 
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_45); 
 
             			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             		
@@ -7999,7 +7999,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"values",
                     		lv_values_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -8007,7 +8007,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3190:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalFSM.g:3192:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop58:
             do {
                 int alt58=2;
@@ -8020,19 +8020,19 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt58) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3190:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalFSM.g:3192:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,47,FOLLOW_47_in_ruleEnumAnnotationAttribute6938); 
+            	    otherlv_7=(Token)match(input,47,FOLLOW_44); 
 
             	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
             	        
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3194:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3195:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalFSM.g:3196:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalFSM.g:3197:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3195:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3196:3: lv_values_8_0= RULE_STRING
+            	    // InternalFSM.g:3197:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalFSM.g:3198:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute6955); 
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_45); 
 
             	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             	    		
@@ -8044,7 +8044,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"values",
             	            		lv_values_8_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -8061,7 +8061,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,16,FOLLOW_16_in_ruleEnumAnnotationAttribute6974); 
+            otherlv_9=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
                 
@@ -8086,7 +8086,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3226:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalFSM.g:3228:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -8094,17 +8094,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3227:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3228:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalFSM.g:3229:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalFSM.g:3230:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
              newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN7013);
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
 
              current =iv_ruleImportedFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN7024); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8122,7 +8122,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3235:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalFSM.g:3237:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8133,16 +8133,16 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3238:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3239:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalFSM.g:3240:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalFSM.g:3241:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3239:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3240:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalFSM.g:3241:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalFSM.g:3242:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
              
                     newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN7071);
+            pushFollow(FOLLOW_46);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -8153,7 +8153,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
              
                     afterParserOrEnumRuleCall();
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3250:1: (kw= '.*' )?
+            // InternalFSM.g:3252:1: (kw= '.*' )?
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -8162,9 +8162,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt59) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3251:2: kw= '.*'
+                    // InternalFSM.g:3253:2: kw= '.*'
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleImportedFQN7090); 
+                    kw=(Token)match(input,54,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
@@ -8196,7 +8196,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3264:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalFSM.g:3266:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -8204,17 +8204,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3265:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3266:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalFSM.g:3267:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalFSM.g:3268:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
              newCompositeNode(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation7132);
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
 
              current =iv_ruleDocumentation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation7142); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8232,7 +8232,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3273:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalFSM.g:3275:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
     public final EObject ruleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -8243,14 +8243,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3276:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3277:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalFSM.g:3278:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalFSM.g:3279:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3277:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3277:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalFSM.g:3279:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalFSM.g:3279:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3277:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3278:5: 
+            // InternalFSM.g:3279:2: ()
+            // InternalFSM.g:3280:5: 
             {
 
                     current = forceCreateModelElement(
@@ -8260,11 +8260,11 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,55,FOLLOW_55_in_ruleDocumentation7188); 
+            otherlv_1=(Token)match(input,55,FOLLOW_47); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3287:1: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalFSM.g:3289:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop60:
             do {
                 int alt60=2;
@@ -8277,12 +8277,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt60) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3288:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalFSM.g:3290:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3288:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3289:3: lv_lines_2_0= RULE_STRING
+            	    // InternalFSM.g:3290:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalFSM.g:3291:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation7205); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_47); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -8294,7 +8294,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -8308,7 +8308,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,56,FOLLOW_56_in_ruleDocumentation7223); 
+            otherlv_3=(Token)match(input,56,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
                 
@@ -8333,7 +8333,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3321:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalFSM.g:3323:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8341,17 +8341,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3322:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3323:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalFSM.g:3324:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalFSM.g:3325:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral7263);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
 
              current =iv_ruleLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral7273); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8369,7 +8369,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3330:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalFSM.g:3332:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8383,10 +8383,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3333:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3334:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalFSM.g:3335:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalFSM.g:3336:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3334:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalFSM.g:3336:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt61=3;
             switch ( input.LA(1) ) {
             case 57:
@@ -8417,12 +8417,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt61) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3335:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalFSM.g:3337:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral7320);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -8435,12 +8435,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3345:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalFSM.g:3347:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral7347);
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
@@ -8453,12 +8453,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3355:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalFSM.g:3357:5: this_StringLiteral_2= ruleStringLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral7374);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
@@ -8491,7 +8491,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3371:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalFSM.g:3373:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8499,17 +8499,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3372:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3373:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalFSM.g:3374:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalFSM.g:3375:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
              newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral7409);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
 
              current =iv_ruleBooleanLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral7419); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8527,7 +8527,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3380:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalFSM.g:3382:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8537,14 +8537,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3383:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3384:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalFSM.g:3385:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalFSM.g:3386:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3384:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3384:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalFSM.g:3386:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalFSM.g:3386:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3384:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3385:5: 
+            // InternalFSM.g:3386:2: ()
+            // InternalFSM.g:3387:5: 
             {
 
                     current = forceCreateModelElement(
@@ -8554,7 +8554,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3390:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalFSM.g:3392:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -8572,9 +8572,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt62) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3390:4: otherlv_1= 'false'
+                    // InternalFSM.g:3392:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,57,FOLLOW_57_in_ruleBooleanLiteral7466); 
+                    otherlv_1=(Token)match(input,57,FOLLOW_2); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
                         
@@ -8582,15 +8582,15 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3395:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalFSM.g:3397:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3395:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3396:1: (lv_isTrue_2_0= 'true' )
+                    // InternalFSM.g:3397:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalFSM.g:3398:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3396:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3397:3: lv_isTrue_2_0= 'true'
+                    // InternalFSM.g:3398:1: (lv_isTrue_2_0= 'true' )
+                    // InternalFSM.g:3399:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,58,FOLLOW_58_in_ruleBooleanLiteral7490); 
+                    lv_isTrue_2_0=(Token)match(input,58,FOLLOW_2); 
 
                             newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
                         
@@ -8633,7 +8633,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3418:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalFSM.g:3420:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8641,17 +8641,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3419:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3420:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalFSM.g:3421:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalFSM.g:3422:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
              newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral7540);
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
 
              current =iv_ruleNumberLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral7550); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8669,7 +8669,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3427:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalFSM.g:3429:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8681,10 +8681,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3430:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3431:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalFSM.g:3432:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalFSM.g:3433:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3431:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalFSM.g:3433:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt63=2;
             switch ( input.LA(1) ) {
             case 59:
@@ -8775,12 +8775,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt63) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3432:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalFSM.g:3434:5: this_IntLiteral_0= ruleIntLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral7597);
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
@@ -8793,12 +8793,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3442:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalFSM.g:3444:5: this_RealLiteral_1= ruleRealLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral7624);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
@@ -8831,7 +8831,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3458:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalFSM.g:3460:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8839,17 +8839,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3459:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3460:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalFSM.g:3461:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalFSM.g:3462:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
              newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral7659);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
 
              current =iv_ruleRealLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral7669); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8867,7 +8867,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3467:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalFSM.g:3469:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8877,14 +8877,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3470:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3471:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalFSM.g:3472:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalFSM.g:3473:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3471:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3471:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalFSM.g:3473:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalFSM.g:3473:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3471:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3472:5: 
+            // InternalFSM.g:3473:2: ()
+            // InternalFSM.g:3474:5: 
             {
 
                     current = forceCreateModelElement(
@@ -8894,16 +8894,16 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3477:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3478:1: (lv_value_1_0= ruleReal )
+            // InternalFSM.g:3479:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalFSM.g:3480:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3478:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3479:3: lv_value_1_0= ruleReal
+            // InternalFSM.g:3480:1: (lv_value_1_0= ruleReal )
+            // InternalFSM.g:3481:3: lv_value_1_0= ruleReal
             {
              
             	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral7724);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
@@ -8916,7 +8916,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Real");
+                    		"org.eclipse.etrice.core.common.Base.Real");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -8946,7 +8946,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3503:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalFSM.g:3505:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8954,17 +8954,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3504:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3505:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalFSM.g:3506:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalFSM.g:3507:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
              newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral7760);
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
 
              current =iv_ruleIntLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral7770); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8982,7 +8982,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3512:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalFSM.g:3514:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8992,14 +8992,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3515:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3516:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalFSM.g:3517:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalFSM.g:3518:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3516:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3516:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalFSM.g:3518:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalFSM.g:3518:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3516:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3517:5: 
+            // InternalFSM.g:3518:2: ()
+            // InternalFSM.g:3519:5: 
             {
 
                     current = forceCreateModelElement(
@@ -9009,16 +9009,16 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3522:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3523:1: (lv_value_1_0= ruleInteger )
+            // InternalFSM.g:3524:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalFSM.g:3525:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3523:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3524:3: lv_value_1_0= ruleInteger
+            // InternalFSM.g:3525:1: (lv_value_1_0= ruleInteger )
+            // InternalFSM.g:3526:3: lv_value_1_0= ruleInteger
             {
              
             	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral7825);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
@@ -9031,7 +9031,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Integer");
+                    		"org.eclipse.etrice.core.common.Base.Integer");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -9061,7 +9061,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3548:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalFSM.g:3550:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -9069,17 +9069,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3549:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3550:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalFSM.g:3551:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalFSM.g:3552:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
              newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral7861);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
 
              current =iv_ruleStringLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral7871); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9097,7 +9097,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3557:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalFSM.g:3559:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -9106,14 +9106,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3560:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3561:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalFSM.g:3562:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalFSM.g:3563:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3561:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3561:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalFSM.g:3563:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalFSM.g:3563:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3561:2: ()
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3562:5: 
+            // InternalFSM.g:3563:2: ()
+            // InternalFSM.g:3564:5: 
             {
 
                     current = forceCreateModelElement(
@@ -9123,13 +9123,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3567:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3568:1: (lv_value_1_0= RULE_STRING )
+            // InternalFSM.g:3569:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalFSM.g:3570:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3568:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3569:3: lv_value_1_0= RULE_STRING
+            // InternalFSM.g:3570:1: (lv_value_1_0= RULE_STRING )
+            // InternalFSM.g:3571:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral7922); 
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             		
@@ -9141,7 +9141,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -9170,7 +9170,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3593:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalFSM.g:3595:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -9178,17 +9178,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3594:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3595:2: iv_ruleInteger= ruleInteger EOF
+            // InternalFSM.g:3596:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalFSM.g:3597:2: iv_ruleInteger= ruleInteger EOF
             {
              newCompositeNode(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger7964);
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
 
              current =iv_ruleInteger.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger7975); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9206,7 +9206,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3602:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalFSM.g:3604:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
     public final AntlrDatatypeRuleToken ruleInteger() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9217,10 +9217,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3605:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3606:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalFSM.g:3607:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalFSM.g:3608:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3606:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalFSM.g:3608:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt65=2;
             int LA65_0 = input.LA(1);
 
@@ -9238,12 +9238,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt65) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3606:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalFSM.g:3608:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3606:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3606:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalFSM.g:3608:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalFSM.g:3608:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3606:3: (kw= '+' | kw= '-' )?
+                    // InternalFSM.g:3608:3: (kw= '+' | kw= '-' )?
                     int alt64=3;
                     int LA64_0 = input.LA(1);
 
@@ -9255,9 +9255,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt64) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3607:2: kw= '+'
+                            // InternalFSM.g:3609:2: kw= '+'
                             {
-                            kw=(Token)match(input,59,FOLLOW_59_in_ruleInteger8015); 
+                            kw=(Token)match(input,59,FOLLOW_48); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
@@ -9266,9 +9266,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3614:2: kw= '-'
+                            // InternalFSM.g:3616:2: kw= '-'
                             {
-                            kw=(Token)match(input,60,FOLLOW_60_in_ruleInteger8034); 
+                            kw=(Token)match(input,60,FOLLOW_48); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
@@ -9279,7 +9279,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger8051); 
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
                     		current.merge(this_INT_2);
                         
@@ -9293,9 +9293,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3627:10: this_HEX_3= RULE_HEX
+                    // InternalFSM.g:3629:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger8078); 
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
                     		current.merge(this_HEX_3);
                         
@@ -9326,7 +9326,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3642:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalFSM.g:3644:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -9334,17 +9334,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3643:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3644:2: iv_ruleReal= ruleReal EOF
+            // InternalFSM.g:3645:2: (iv_ruleReal= ruleReal EOF )
+            // InternalFSM.g:3646:2: iv_ruleReal= ruleReal EOF
             {
              newCompositeNode(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal8124);
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
 
              current =iv_ruleReal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal8135); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9362,7 +9362,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3651:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalFSM.g:3653:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
     public final AntlrDatatypeRuleToken ruleReal() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9374,10 +9374,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3654:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3655:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalFSM.g:3656:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalFSM.g:3657:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3655:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalFSM.g:3657:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt66=2;
             switch ( input.LA(1) ) {
             case 59:
@@ -9523,12 +9523,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt66) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3656:5: this_Decimal_0= ruleDecimal
+                    // InternalFSM.g:3658:5: this_Decimal_0= ruleDecimal
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal8182);
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
@@ -9543,12 +9543,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3668:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalFSM.g:3670:5: this_DecimalExp_1= ruleDecimalExp
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal8215);
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
@@ -9583,7 +9583,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3686:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalFSM.g:3688:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -9594,17 +9594,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3690:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3691:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalFSM.g:3692:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalFSM.g:3693:2: iv_ruleDecimal= ruleDecimal EOF
             {
              newCompositeNode(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal8267);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
 
              current =iv_ruleDecimal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal8278); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9625,7 +9625,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3701:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalFSM.g:3703:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
     public final AntlrDatatypeRuleToken ruleDecimal() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9637,13 +9637,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3705:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3706:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalFSM.g:3707:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalFSM.g:3708:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3706:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3706:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalFSM.g:3708:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalFSM.g:3708:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3706:2: (kw= '+' | kw= '-' )?
+            // InternalFSM.g:3708:2: (kw= '+' | kw= '-' )?
             int alt67=3;
             int LA67_0 = input.LA(1);
 
@@ -9655,9 +9655,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt67) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3707:2: kw= '+'
+                    // InternalFSM.g:3709:2: kw= '+'
                     {
-                    kw=(Token)match(input,59,FOLLOW_59_in_ruleDecimal8321); 
+                    kw=(Token)match(input,59,FOLLOW_48); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
@@ -9666,9 +9666,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3714:2: kw= '-'
+                    // InternalFSM.g:3716:2: kw= '-'
                     {
-                    kw=(Token)match(input,60,FOLLOW_60_in_ruleDecimal8340); 
+                    kw=(Token)match(input,60,FOLLOW_48); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
@@ -9679,19 +9679,19 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal8357); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_49); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,61,FOLLOW_61_in_ruleDecimal8375); 
+            kw=(Token)match(input,61,FOLLOW_48); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal8390); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_4);
                 
@@ -9722,7 +9722,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3750:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalFSM.g:3752:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -9733,17 +9733,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3754:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3755:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalFSM.g:3756:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalFSM.g:3757:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
              newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp8446);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
 
              current =iv_ruleDecimalExp.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp8457); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9764,7 +9764,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3765:1: ruleDecimalExp returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT ) ;
+    // InternalFSM.g:3767:1: ruleDecimalExp returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT ) ;
     public final AntlrDatatypeRuleToken ruleDecimalExp() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9777,13 +9777,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3769:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3770:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT )
+            // InternalFSM.g:3771:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT ) )
+            // InternalFSM.g:3772:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3770:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3770:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT
+            // InternalFSM.g:3772:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT )
+            // InternalFSM.g:3772:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? this_INT_9= RULE_INT
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3770:2: (kw= '+' | kw= '-' )?
+            // InternalFSM.g:3772:2: (kw= '+' | kw= '-' )?
             int alt68=3;
             int LA68_0 = input.LA(1);
 
@@ -9795,9 +9795,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt68) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3771:2: kw= '+'
+                    // InternalFSM.g:3773:2: kw= '+'
                     {
-                    kw=(Token)match(input,59,FOLLOW_59_in_ruleDecimalExp8500); 
+                    kw=(Token)match(input,59,FOLLOW_48); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
@@ -9806,9 +9806,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3778:2: kw= '-'
+                    // InternalFSM.g:3780:2: kw= '-'
                     {
-                    kw=(Token)match(input,60,FOLLOW_60_in_ruleDecimalExp8519); 
+                    kw=(Token)match(input,60,FOLLOW_48); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
@@ -9819,26 +9819,26 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp8536); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_49); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,61,FOLLOW_61_in_ruleDecimalExp8554); 
+            kw=(Token)match(input,61,FOLLOW_48); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp8569); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_50); 
 
             		current.merge(this_INT_4);
                 
              
                 newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3803:1: (kw= 'e' | kw= 'E' )
+            // InternalFSM.g:3805:1: (kw= 'e' | kw= 'E' )
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -9856,9 +9856,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt69) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3804:2: kw= 'e'
+                    // InternalFSM.g:3806:2: kw= 'e'
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleDecimalExp8588); 
+                    kw=(Token)match(input,62,FOLLOW_51); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
@@ -9867,9 +9867,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3811:2: kw= 'E'
+                    // InternalFSM.g:3813:2: kw= 'E'
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleDecimalExp8607); 
+                    kw=(Token)match(input,63,FOLLOW_51); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
@@ -9880,7 +9880,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3816:2: (kw= '+' | kw= '-' )?
+            // InternalFSM.g:3818:2: (kw= '+' | kw= '-' )?
             int alt70=3;
             int LA70_0 = input.LA(1);
 
@@ -9892,9 +9892,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             }
             switch (alt70) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3817:2: kw= '+'
+                    // InternalFSM.g:3819:2: kw= '+'
                     {
-                    kw=(Token)match(input,59,FOLLOW_59_in_ruleDecimalExp8622); 
+                    kw=(Token)match(input,59,FOLLOW_48); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
@@ -9903,9 +9903,9 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3824:2: kw= '-'
+                    // InternalFSM.g:3826:2: kw= '-'
                     {
-                    kw=(Token)match(input,60,FOLLOW_60_in_ruleDecimalExp8641); 
+                    kw=(Token)match(input,60,FOLLOW_48); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
@@ -9916,7 +9916,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp8658); 
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_9);
                 
@@ -9947,7 +9947,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3847:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalFSM.g:3849:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -9955,17 +9955,17 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3848:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3849:2: iv_ruleFQN= ruleFQN EOF
+            // InternalFSM.g:3850:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalFSM.g:3851:2: iv_ruleFQN= ruleFQN EOF
             {
              newCompositeNode(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN8708);
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
 
              current =iv_ruleFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN8719); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9983,7 +9983,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3856:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalFSM.g:3858:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
     public final AntlrDatatypeRuleToken ruleFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9994,20 +9994,20 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3859:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3860:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalFSM.g:3861:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalFSM.g:3862:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3860:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3860:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalFSM.g:3862:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalFSM.g:3862:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN8759); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_52); 
 
             		current.merge(this_ID_0);
                 
              
                 newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
                 
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3867:1: (kw= '.' this_ID_2= RULE_ID )*
+            // InternalFSM.g:3869:1: (kw= '.' this_ID_2= RULE_ID )*
             loop71:
             do {
                 int alt71=2;
@@ -10020,14 +10020,14 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
                 switch (alt71) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3868:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalFSM.g:3870:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,61,FOLLOW_61_in_ruleFQN8778); 
+            	    kw=(Token)match(input,61,FOLLOW_5); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             	        
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN8793); 
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_52); 
 
             	    		current.merge(this_ID_2);
             	        
@@ -10064,7 +10064,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleComponentCommunicationType"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3888:1: ruleComponentCommunicationType returns [Enumerator current=null] : ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) ;
+    // InternalFSM.g:3890:1: ruleComponentCommunicationType returns [Enumerator current=null] : ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) ;
     public final Enumerator ruleComponentCommunicationType() throws RecognitionException {
         Enumerator current = null;
 
@@ -10075,10 +10075,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3890:28: ( ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3891:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
+            // InternalFSM.g:3892:28: ( ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) )
+            // InternalFSM.g:3893:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3891:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
+            // InternalFSM.g:3893:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
             int alt72=4;
             switch ( input.LA(1) ) {
             case 64:
@@ -10110,12 +10110,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt72) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3891:2: (enumLiteral_0= 'eventdriven' )
+                    // InternalFSM.g:3893:2: (enumLiteral_0= 'eventdriven' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3891:2: (enumLiteral_0= 'eventdriven' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3891:4: enumLiteral_0= 'eventdriven'
+                    // InternalFSM.g:3893:2: (enumLiteral_0= 'eventdriven' )
+                    // InternalFSM.g:3893:4: enumLiteral_0= 'eventdriven'
                     {
-                    enumLiteral_0=(Token)match(input,64,FOLLOW_64_in_ruleComponentCommunicationType8854); 
+                    enumLiteral_0=(Token)match(input,64,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getComponentCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0()); 
@@ -10127,12 +10127,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3897:6: (enumLiteral_1= 'datadriven' )
+                    // InternalFSM.g:3899:6: (enumLiteral_1= 'datadriven' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3897:6: (enumLiteral_1= 'datadriven' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3897:8: enumLiteral_1= 'datadriven'
+                    // InternalFSM.g:3899:6: (enumLiteral_1= 'datadriven' )
+                    // InternalFSM.g:3899:8: enumLiteral_1= 'datadriven'
                     {
-                    enumLiteral_1=(Token)match(input,65,FOLLOW_65_in_ruleComponentCommunicationType8871); 
+                    enumLiteral_1=(Token)match(input,65,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getComponentCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1()); 
@@ -10144,12 +10144,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3903:6: (enumLiteral_2= 'async' )
+                    // InternalFSM.g:3905:6: (enumLiteral_2= 'async' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3903:6: (enumLiteral_2= 'async' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3903:8: enumLiteral_2= 'async'
+                    // InternalFSM.g:3905:6: (enumLiteral_2= 'async' )
+                    // InternalFSM.g:3905:8: enumLiteral_2= 'async'
                     {
-                    enumLiteral_2=(Token)match(input,66,FOLLOW_66_in_ruleComponentCommunicationType8888); 
+                    enumLiteral_2=(Token)match(input,66,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getASYNCHRONOUSEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getComponentCommunicationTypeAccess().getASYNCHRONOUSEnumLiteralDeclaration_2()); 
@@ -10161,12 +10161,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3909:6: (enumLiteral_3= 'sync' )
+                    // InternalFSM.g:3911:6: (enumLiteral_3= 'sync' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3909:6: (enumLiteral_3= 'sync' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3909:8: enumLiteral_3= 'sync'
+                    // InternalFSM.g:3911:6: (enumLiteral_3= 'sync' )
+                    // InternalFSM.g:3911:8: enumLiteral_3= 'sync'
                     {
-                    enumLiteral_3=(Token)match(input,67,FOLLOW_67_in_ruleComponentCommunicationType8905); 
+                    enumLiteral_3=(Token)match(input,67,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getComponentCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_3()); 
@@ -10198,7 +10198,7 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3919:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalFSM.g:3921:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
     public final Enumerator ruleLiteralType() throws RecognitionException {
         Enumerator current = null;
 
@@ -10209,10 +10209,10 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3921:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3922:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalFSM.g:3923:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalFSM.g:3924:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3922:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalFSM.g:3924:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt73=4;
             switch ( input.LA(1) ) {
             case 68:
@@ -10244,12 +10244,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
             switch (alt73) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3922:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalFSM.g:3924:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3922:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3922:4: enumLiteral_0= 'ptBoolean'
+                    // InternalFSM.g:3924:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalFSM.g:3924:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,68,FOLLOW_68_in_ruleLiteralType8950); 
+                    enumLiteral_0=(Token)match(input,68,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
@@ -10261,12 +10261,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3928:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalFSM.g:3930:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3928:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3928:8: enumLiteral_1= 'ptInteger'
+                    // InternalFSM.g:3930:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalFSM.g:3930:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,69,FOLLOW_69_in_ruleLiteralType8967); 
+                    enumLiteral_1=(Token)match(input,69,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
@@ -10278,12 +10278,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3934:6: (enumLiteral_2= 'ptReal' )
+                    // InternalFSM.g:3936:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3934:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3934:8: enumLiteral_2= 'ptReal'
+                    // InternalFSM.g:3936:6: (enumLiteral_2= 'ptReal' )
+                    // InternalFSM.g:3936:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,70,FOLLOW_70_in_ruleLiteralType8984); 
+                    enumLiteral_2=(Token)match(input,70,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
@@ -10295,12 +10295,12 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3940:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalFSM.g:3942:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3940:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/parser/antlr/internal/InternalFSM.g:3940:8: enumLiteral_3= 'ptCharacter'
+                    // InternalFSM.g:3942:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalFSM.g:3942:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,71,FOLLOW_71_in_ruleLiteralType9001); 
+                    enumLiteral_3=(Token)match(input,71,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
@@ -10335,21 +10335,13 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
 
     protected DFA24 dfa24 = new DFA24(this);
     protected DFA25 dfa25 = new DFA25(this);
-    static final String DFA24_eotS =
-        "\32\uffff";
-    static final String DFA24_eofS =
-        "\14\uffff\1\21\6\uffff\2\21\1\uffff\1\21\2\uffff\1\21";
-    static final String DFA24_minS =
-        "\1\35\1\4\1\36\1\4\1\40\4\4\3\40\1\17\2\4\1\5\1\20\1\uffff\1\4"+
-        "\2\17\1\5\1\17\2\uffff\1\17";
-    static final String DFA24_maxS =
-        "\1\35\2\36\1\51\1\50\3\4\1\51\3\40\1\67\2\4\1\70\1\45\1\uffff\1"+
-        "\4\2\67\1\70\1\46\2\uffff\1\67";
-    static final String DFA24_acceptS =
-        "\21\uffff\1\2\5\uffff\1\1\1\3\1\uffff";
-    static final String DFA24_specialS =
-        "\32\uffff}>";
-    static final String[] DFA24_transitionS = {
+    static final String dfa_1s = "\32\uffff";
+    static final String dfa_2s = "\14\uffff\1\21\6\uffff\2\21\1\uffff\1\21\2\uffff\1\21";
+    static final String dfa_3s = "\1\35\1\4\1\36\1\4\1\40\4\4\3\40\1\17\2\4\1\5\1\20\1\uffff\1\4\2\17\1\5\1\17\2\uffff\1\17";
+    static final String dfa_4s = "\1\35\2\36\1\51\1\50\3\4\1\51\3\40\1\67\2\4\1\70\1\45\1\uffff\1\4\2\67\1\70\1\46\2\uffff\1\67";
+    static final String dfa_5s = "\21\uffff\1\2\5\uffff\1\1\1\3\1\uffff";
+    static final String dfa_6s = "\32\uffff}>";
+    static final String[] dfa_7s = {
             "\1\1",
             "\1\2\31\uffff\1\3",
             "\1\3",
@@ -10362,74 +10354,53 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             "\1\10",
             "\1\10",
             "\1\10",
-            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\1\uffff"+
-            "\1\22\16\uffff\1\17",
+            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\1\uffff\1\22\16\uffff\1\17",
             "\1\23",
             "\1\24",
             "\1\25\62\uffff\1\26",
             "\1\21\20\uffff\1\21\1\27\1\uffff\1\27\1\30",
             "",
             "\1\31",
-            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\20\uffff"+
-            "\1\17",
-            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\20\uffff"+
-            "\1\17",
+            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\20\uffff\1\17",
+            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\20\uffff\1\17",
             "\1\25\62\uffff\1\26",
             "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21",
             "",
             "",
-            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\20\uffff"+
-            "\1\17"
+            "\1\20\1\21\1\uffff\1\21\4\uffff\7\21\10\uffff\1\21\20\uffff\1\17"
     };
 
-    static final short[] DFA24_eot = DFA.unpackEncodedString(DFA24_eotS);
-    static final short[] DFA24_eof = DFA.unpackEncodedString(DFA24_eofS);
-    static final char[] DFA24_min = DFA.unpackEncodedStringToUnsignedChars(DFA24_minS);
-    static final char[] DFA24_max = DFA.unpackEncodedStringToUnsignedChars(DFA24_maxS);
-    static final short[] DFA24_accept = DFA.unpackEncodedString(DFA24_acceptS);
-    static final short[] DFA24_special = DFA.unpackEncodedString(DFA24_specialS);
-    static final short[][] DFA24_transition;
-
-    static {
-        int numStates = DFA24_transitionS.length;
-        DFA24_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA24_transition[i] = DFA.unpackEncodedString(DFA24_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final short[] dfa_2 = DFA.unpackEncodedString(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final char[] dfa_4 = DFA.unpackEncodedStringToUnsignedChars(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
+    static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
     class DFA24 extends DFA {
 
         public DFA24(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 24;
-            this.eot = DFA24_eot;
-            this.eof = DFA24_eof;
-            this.min = DFA24_min;
-            this.max = DFA24_max;
-            this.accept = DFA24_accept;
-            this.special = DFA24_special;
-            this.transition = DFA24_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_2;
+            this.min = dfa_3;
+            this.max = dfa_4;
+            this.accept = dfa_5;
+            this.special = dfa_6;
+            this.transition = dfa_7;
         }
         public String getDescription() {
-            return "1297:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )";
+            return "1299:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )";
         }
     }
-    static final String DFA25_eotS =
-        "\31\uffff";
-    static final String DFA25_eofS =
-        "\31\uffff";
-    static final String DFA25_minS =
-        "\1\35\1\4\1\36\1\4\1\40\4\4\3\40\1\17\3\4\1\5\1\42\3\17\1\5\1\17"+
-        "\2\uffff";
-    static final String DFA25_maxS =
-        "\1\35\2\36\1\51\1\50\3\4\1\51\3\40\1\67\3\4\1\70\1\44\3\67\1\70"+
-        "\1\17\2\uffff";
-    static final String DFA25_acceptS =
-        "\27\uffff\1\1\1\2";
-    static final String DFA25_specialS =
-        "\31\uffff}>";
-    static final String[] DFA25_transitionS = {
+    static final String dfa_8s = "\31\uffff";
+    static final String dfa_9s = "\1\35\1\4\1\36\1\4\1\40\4\4\3\40\1\17\3\4\1\5\1\42\3\17\1\5\1\17\2\uffff";
+    static final String dfa_10s = "\1\35\2\36\1\51\1\50\3\4\1\51\3\40\1\67\3\4\1\70\1\44\3\67\1\70\1\17\2\uffff";
+    static final String dfa_11s = "\27\uffff\1\1\1\2";
+    static final String dfa_12s = "\31\uffff}>";
+    static final String[] dfa_13s = {
             "\1\1",
             "\1\2\31\uffff\1\3",
             "\1\3",
@@ -10457,407 +10428,83 @@ public class InternalFSMParser extends AbstractInternalAntlrParser {
             ""
     };
 
-    static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);
-    static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);
-    static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);
-    static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);
-    static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);
-    static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);
-    static final short[][] DFA25_transition;
-
-    static {
-        int numStates = DFA25_transitionS.length;
-        DFA25_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);
-        }
-    }
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
     class DFA25 extends DFA {
 
         public DFA25(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 25;
-            this.eot = DFA25_eot;
-            this.eof = DFA25_eof;
-            this.min = DFA25_min;
-            this.max = DFA25_max;
-            this.accept = DFA25_accept;
-            this.special = DFA25_special;
-            this.transition = DFA25_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_9;
+            this.max = dfa_10;
+            this.accept = dfa_11;
+            this.special = dfa_12;
+            this.transition = dfa_13;
         }
         public String getDescription() {
-            return "1347:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )";
+            return "1349:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )";
         }
     }
  
 
-    public static final BitSet FOLLOW_ruleFSMModel_in_entryRuleFSMModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFSMModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModelComponent_in_ruleFSMModel130 = new BitSet(new long[]{0x0000000000003002L,0x000000000000000FL});
-    public static final BitSet FOLLOW_ruleModelComponent_in_entryRuleModelComponent166 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModelComponent176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleModelComponent264 = new BitSet(new long[]{0x0000000000003000L,0x000000000000000FL});
-    public static final BitSet FOLLOW_ruleComponentCommunicationType_in_ruleModelComponent352 = new BitSet(new long[]{0x0000000000003000L,0x000000000000000FL});
-    public static final BitSet FOLLOW_13_in_ruleModelComponent404 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleModelComponent421 = new BitSet(new long[]{0x0000000000024000L});
-    public static final BitSet FOLLOW_14_in_ruleModelComponent439 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleModelComponent462 = new BitSet(new long[]{0x0000000000024000L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_ruleModelComponent485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode521 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraphNode531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_ruleStateGraphNode578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_ruleStateGraphNode605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_ruleStateGraphNode632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_entryRuleStateGraph669 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraph679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleStateGraph725 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleState_in_ruleStateGraph747 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_ruleStateGraph774 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_ruleStateGraph801 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleTransition_in_ruleStateGraph828 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_ruleStateGraph855 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_16_in_ruleStateGraph869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_entryRuleStateMachine905 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateMachine915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleStateMachine961 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleStateMachine973 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleState_in_ruleStateMachine995 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_ruleStateMachine1022 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_ruleStateMachine1049 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleTransition_in_ruleStateMachine1076 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_ruleStateMachine1103 = new BitSet(new long[]{0x000000403F850000L});
-    public static final BitSet FOLLOW_16_in_ruleStateMachine1117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_entryRuleState1153 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleState1163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_ruleState1210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_ruleState1237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_entryRuleSimpleState1272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleState1282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleSimpleState1319 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleState1336 = new BitSet(new long[]{0x0080000000008002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleSimpleState1362 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_15_in_ruleSimpleState1376 = new BitSet(new long[]{0x0000000000790000L});
-    public static final BitSet FOLLOW_19_in_ruleSimpleState1389 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSimpleState1410 = new BitSet(new long[]{0x0000000000710000L});
-    public static final BitSet FOLLOW_20_in_ruleSimpleState1425 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSimpleState1446 = new BitSet(new long[]{0x0000000000610000L});
-    public static final BitSet FOLLOW_21_in_ruleSimpleState1461 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSimpleState1482 = new BitSet(new long[]{0x0000000000410000L});
-    public static final BitSet FOLLOW_22_in_ruleSimpleState1497 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_ruleSimpleState1518 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleSimpleState1532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_entryRuleRefinedState1570 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedState1580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleRefinedState1617 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleRefinedState1640 = new BitSet(new long[]{0x0080000000008000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleRefinedState1661 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleRefinedState1674 = new BitSet(new long[]{0x0000000000790000L});
-    public static final BitSet FOLLOW_19_in_ruleRefinedState1687 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedState1708 = new BitSet(new long[]{0x0000000000710000L});
-    public static final BitSet FOLLOW_20_in_ruleRefinedState1723 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedState1744 = new BitSet(new long[]{0x0000000000610000L});
-    public static final BitSet FOLLOW_21_in_ruleRefinedState1759 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedState1780 = new BitSet(new long[]{0x0000000000410000L});
-    public static final BitSet FOLLOW_22_in_ruleRefinedState1795 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_ruleRefinedState1816 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleRefinedState1830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_entryRuleDetailCode1866 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDetailCode1876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleDetailCode1928 = new BitSet(new long[]{0x0000000000010020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDetailCode1958 = new BitSet(new long[]{0x0000000000010020L});
-    public static final BitSet FOLLOW_16_in_ruleDetailCode1976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_entryRuleTrPoint2012 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPoint2022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_ruleTrPoint2069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_ruleTrPoint2096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_ruleTrPoint2123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint2158 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionPoint2168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleTransitionPoint2211 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleTransitionPoint2237 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTransitionPoint2254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint2295 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEntryPoint2305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleEntryPoint2342 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEntryPoint2359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_entryRuleExitPoint2400 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExitPoint2410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleExitPoint2447 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleExitPoint2464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint2505 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicePoint2515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleChoicePoint2552 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleChoicePoint2569 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleChoicePoint2595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_entryRuleTransition2632 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransition2642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_ruleTransition2689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_ruleTransition2716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition2751 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNonInitialTransition2761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_ruleNonInitialTransition2808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_ruleNonInitialTransition2835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_ruleNonInitialTransition2862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition2897 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionChainStartTransition2907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_ruleTransitionChainStartTransition2954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_ruleTransitionChainStartTransition2981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition3016 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInitialTransition3026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleInitialTransition3063 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInitialTransition3080 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleInitialTransition3098 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleInitialTransition3110 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleInitialTransition3122 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleInitialTransition3143 = new BitSet(new long[]{0x0080000000008002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleInitialTransition3164 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_15_in_ruleInitialTransition3178 = new BitSet(new long[]{0x0000000200010000L});
-    public static final BitSet FOLLOW_33_in_ruleInitialTransition3191 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleInitialTransition3212 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleInitialTransition3226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition3264 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContinuationTransition3274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleContinuationTransition3311 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleContinuationTransition3328 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleContinuationTransition3346 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition3367 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleContinuationTransition3379 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition3400 = new BitSet(new long[]{0x0080000000008002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleContinuationTransition3421 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_15_in_ruleContinuationTransition3435 = new BitSet(new long[]{0x0000000200010000L});
-    public static final BitSet FOLLOW_33_in_ruleContinuationTransition3448 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleContinuationTransition3469 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleContinuationTransition3483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition3521 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTriggeredTransition3531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleTriggeredTransition3568 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTriggeredTransition3585 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleTriggeredTransition3603 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition3624 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleTriggeredTransition3636 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition3657 = new BitSet(new long[]{0x0080000000008000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleTriggeredTransition3678 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleTriggeredTransition3691 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleTriggeredTransition3703 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleTriggeredTransition3715 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_ruleTrigger_in_ruleTriggeredTransition3736 = new BitSet(new long[]{0x0000000800010000L});
-    public static final BitSet FOLLOW_35_in_ruleTriggeredTransition3749 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_ruleTrigger_in_ruleTriggeredTransition3770 = new BitSet(new long[]{0x0000000800010000L});
-    public static final BitSet FOLLOW_16_in_ruleTriggeredTransition3784 = new BitSet(new long[]{0x0000000200010000L});
-    public static final BitSet FOLLOW_33_in_ruleTriggeredTransition3797 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleTriggeredTransition3818 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleTriggeredTransition3832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition3868 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuardedTransition3878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleGuardedTransition3915 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleGuardedTransition3932 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleGuardedTransition3950 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition3971 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleGuardedTransition3983 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition4004 = new BitSet(new long[]{0x0080000000008000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleGuardedTransition4025 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleGuardedTransition4038 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleGuardedTransition4050 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleGuardedTransition4071 = new BitSet(new long[]{0x0000000200010000L});
-    public static final BitSet FOLLOW_33_in_ruleGuardedTransition4084 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleGuardedTransition4105 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleGuardedTransition4119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition4155 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCPBranchTransition4165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleCPBranchTransition4202 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleCPBranchTransition4219 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleCPBranchTransition4237 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition4258 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleCPBranchTransition4270 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition4291 = new BitSet(new long[]{0x0080000000008000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleCPBranchTransition4312 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleCPBranchTransition4325 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_ruleCPBranchTransition4337 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleCPBranchTransition4358 = new BitSet(new long[]{0x0000000200010000L});
-    public static final BitSet FOLLOW_33_in_ruleCPBranchTransition4371 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleCPBranchTransition4392 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleCPBranchTransition4406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition4442 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedTransition4452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleRefinedTransition4489 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleRefinedTransition4512 = new BitSet(new long[]{0x0080000000008000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleRefinedTransition4533 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleRefinedTransition4546 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleRefinedTransition4558 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedTransition4579 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleRefinedTransition4591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal4627 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionTerminal4637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_ruleTransitionTerminal4684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_ruleTransitionTerminal4711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_ruleTransitionTerminal4738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_ruleTransitionTerminal4765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal4800 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateTerminal4810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleStateTerminal4854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal4889 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPointTerminal4899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleTrPointTerminal4936 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTrPointTerminal4956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal4992 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal5002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal5047 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_40_in_ruleSubStateTrPointTerminal5059 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal5079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal5115 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicepointTerminal5125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleChoicepointTerminal5162 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleChoicepointTerminal5182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_entryRuleTrigger5218 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrigger5228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_ruleTrigger5265 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_ruleTrigger5286 = new BitSet(new long[]{0x0000181000000000L});
-    public static final BitSet FOLLOW_43_in_ruleTrigger5299 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_ruleTrigger5320 = new BitSet(new long[]{0x0000181000000000L});
-    public static final BitSet FOLLOW_ruleGuard_in_ruleTrigger5343 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_44_in_ruleTrigger5356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf5392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageFromIf5402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageFromIf5447 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleMessageFromIf5459 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageFromIf5479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuard_in_entryRuleGuard5517 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuard5527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleGuard5564 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleGuard5585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule5623 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSemanticsRule5633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_ruleSemanticsRule5680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_ruleSemanticsRule5707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule5742 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInSemanticsRule5752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleInSemanticsRule5789 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleInSemanticsRule5801 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInSemanticsRule5821 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_32_in_ruleInSemanticsRule5834 = new BitSet(new long[]{0x0002600000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule5856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleInSemanticsRule5875 = new BitSet(new long[]{0x0002200000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule5896 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleInSemanticsRule5909 = new BitSet(new long[]{0x0002200000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule5930 = new BitSet(new long[]{0x0001800000000000L});
-    public static final BitSet FOLLOW_48_in_ruleInSemanticsRule5944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule5984 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutSemanticsRule5994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleOutSemanticsRule6031 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleOutSemanticsRule6043 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleOutSemanticsRule6063 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_32_in_ruleOutSemanticsRule6076 = new BitSet(new long[]{0x0002600000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule6098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleOutSemanticsRule6117 = new BitSet(new long[]{0x0002200000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule6138 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleOutSemanticsRule6151 = new BitSet(new long[]{0x0002200000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule6172 = new BitSet(new long[]{0x0001800000000000L});
-    public static final BitSet FOLLOW_48_in_ruleOutSemanticsRule6186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue6228 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue6238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue6280 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_50_in_ruleKeyValue6297 = new BitSet(new long[]{0x1E000000000000E0L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue6318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType6357 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType6368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType6407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute6451 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute6461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute6508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute6535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute6570 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute6580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleSimpleAnnotationAttribute6624 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_52_in_ruleSimpleAnnotationAttribute6655 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_53_in_ruleSimpleAnnotationAttribute6668 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute6685 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleSimpleAnnotationAttribute6702 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000F0L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute6723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute6759 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute6769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleEnumAnnotationAttribute6813 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_52_in_ruleEnumAnnotationAttribute6844 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_53_in_ruleEnumAnnotationAttribute6857 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute6874 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleEnumAnnotationAttribute6891 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleEnumAnnotationAttribute6903 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute6920 = new BitSet(new long[]{0x0000800000010000L});
-    public static final BitSet FOLLOW_47_in_ruleEnumAnnotationAttribute6938 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute6955 = new BitSet(new long[]{0x0000800000010000L});
-    public static final BitSet FOLLOW_16_in_ruleEnumAnnotationAttribute6974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN7013 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN7024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN7071 = new BitSet(new long[]{0x0040000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleImportedFQN7090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation7132 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation7142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleDocumentation7188 = new BitSet(new long[]{0x0100000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation7205 = new BitSet(new long[]{0x0100000000000020L});
-    public static final BitSet FOLLOW_56_in_ruleDocumentation7223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral7263 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral7273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral7320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral7347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral7374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral7409 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral7419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleBooleanLiteral7466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleBooleanLiteral7490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral7540 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral7550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral7597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral7624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral7659 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral7669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral7724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral7760 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral7770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral7825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral7861 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral7871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral7922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger7964 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger7975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleInteger8015 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_60_in_ruleInteger8034 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger8051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger8078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal8124 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal8135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal8182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal8215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal8267 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal8278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleDecimal8321 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_60_in_ruleDecimal8340 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal8357 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_61_in_ruleDecimal8375 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal8390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp8446 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp8457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleDecimalExp8500 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_60_in_ruleDecimalExp8519 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp8536 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_61_in_ruleDecimalExp8554 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp8569 = new BitSet(new long[]{0xC000000000000000L});
-    public static final BitSet FOLLOW_62_in_ruleDecimalExp8588 = new BitSet(new long[]{0x1800000000000040L});
-    public static final BitSet FOLLOW_63_in_ruleDecimalExp8607 = new BitSet(new long[]{0x1800000000000040L});
-    public static final BitSet FOLLOW_59_in_ruleDecimalExp8622 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_60_in_ruleDecimalExp8641 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp8658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN8708 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN8719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN8759 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleFQN8778 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN8793 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleComponentCommunicationType8854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleComponentCommunicationType8871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_ruleComponentCommunicationType8888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_ruleComponentCommunicationType8905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleLiteralType8950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleLiteralType8967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_ruleLiteralType8984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_ruleLiteralType9001 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000003002L,0x000000000000000FL});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000003000L,0x000000000000000FL});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000024000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x000000403F850000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0080000000008002L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000790000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000710000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000610000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000410000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0080000000008000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000010020L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0080000000000002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000040000010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000028000000010L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000200010000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000800010000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000181000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000100000002L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0002600000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0002200000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0001800000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x1E000000000000E0L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000F0L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000800000010000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0100000000000020L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0xC000000000000000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x1800000000000040L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x2000000000000002L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSemanticSequencer.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSemanticSequencer.java
index c74e7e5e4..468068ea0 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.serializer;
 
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.etrice.core.common.base.Annotation;
 import org.eclipse.etrice.core.common.base.AnnotationType;
 import org.eclipse.etrice.core.common.base.BasePackage;
@@ -46,14 +50,11 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionPoint;
 import org.eclipse.etrice.core.fsm.fSM.Trigger;
 import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
 import org.eclipse.etrice.core.fsm.services.FSMGrammarAccess;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
@@ -62,316 +63,172 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	@Inject
 	private FSMGrammarAccess grammarAccess;
 	
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == BasePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	@Override
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == BasePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case BasePackage.ANNOTATION:
-				if(context == grammarAccess.getAnnotationRule()) {
-					sequence_Annotation(context, (Annotation) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Annotation(context, (Annotation) semanticObject); 
+				return; 
 			case BasePackage.ANNOTATION_TYPE:
-				if(context == grammarAccess.getAnnotationTypeRule()) {
-					sequence_AnnotationType(context, (AnnotationType) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_AnnotationType(context, (AnnotationType) semanticObject); 
+				return; 
 			case BasePackage.BOOLEAN_LITERAL:
-				if(context == grammarAccess.getBooleanLiteralRule() ||
-				   context == grammarAccess.getLiteralRule()) {
-					sequence_BooleanLiteral(context, (BooleanLiteral) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_BooleanLiteral(context, (BooleanLiteral) semanticObject); 
+				return; 
 			case BasePackage.DOCUMENTATION:
-				if(context == grammarAccess.getDocumentationRule()) {
-					sequence_Documentation(context, (Documentation) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Documentation(context, (Documentation) semanticObject); 
+				return; 
 			case BasePackage.ENUM_ANNOTATION_ATTRIBUTE:
-				if(context == grammarAccess.getAnnotationAttributeRule() ||
-				   context == grammarAccess.getEnumAnnotationAttributeRule()) {
-					sequence_EnumAnnotationAttribute(context, (EnumAnnotationAttribute) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_EnumAnnotationAttribute(context, (EnumAnnotationAttribute) semanticObject); 
+				return; 
 			case BasePackage.IMPORT:
-				if(context == grammarAccess.getImportRule()) {
-					sequence_Import(context, (Import) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Import(context, (Import) semanticObject); 
+				return; 
 			case BasePackage.INT_LITERAL:
-				if(context == grammarAccess.getIntLiteralRule() ||
-				   context == grammarAccess.getLiteralRule() ||
-				   context == grammarAccess.getNumberLiteralRule()) {
-					sequence_IntLiteral(context, (IntLiteral) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_IntLiteral(context, (IntLiteral) semanticObject); 
+				return; 
 			case BasePackage.KEY_VALUE:
-				if(context == grammarAccess.getKeyValueRule()) {
-					sequence_KeyValue(context, (KeyValue) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_KeyValue(context, (KeyValue) semanticObject); 
+				return; 
 			case BasePackage.LITERAL_ARRAY:
-				if(context == grammarAccess.getLiteralArrayRule()) {
-					sequence_LiteralArray(context, (LiteralArray) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_LiteralArray(context, (LiteralArray) semanticObject); 
+				return; 
 			case BasePackage.REAL_LITERAL:
-				if(context == grammarAccess.getLiteralRule() ||
-				   context == grammarAccess.getNumberLiteralRule() ||
-				   context == grammarAccess.getRealLiteralRule()) {
-					sequence_RealLiteral(context, (RealLiteral) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RealLiteral(context, (RealLiteral) semanticObject); 
+				return; 
 			case BasePackage.SIMPLE_ANNOTATION_ATTRIBUTE:
-				if(context == grammarAccess.getAnnotationAttributeRule() ||
-				   context == grammarAccess.getSimpleAnnotationAttributeRule()) {
-					sequence_SimpleAnnotationAttribute(context, (SimpleAnnotationAttribute) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SimpleAnnotationAttribute(context, (SimpleAnnotationAttribute) semanticObject); 
+				return; 
 			case BasePackage.STRING_LITERAL:
-				if(context == grammarAccess.getLiteralRule() ||
-				   context == grammarAccess.getStringLiteralRule()) {
-					sequence_StringLiteral(context, (StringLiteral) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_StringLiteral(context, (StringLiteral) semanticObject); 
+				return; 
 			}
-		else if(semanticObject.eClass().getEPackage() == FSMPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == FSMPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case FSMPackage.ABSTRACT_INTERFACE_ITEM:
-				if(context == grammarAccess.getAbstractInterfaceItemRule()) {
-					sequence_AbstractInterfaceItem(context, (AbstractInterfaceItem) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_AbstractInterfaceItem(context, (AbstractInterfaceItem) semanticObject); 
+				return; 
 			case FSMPackage.CP_BRANCH_TRANSITION:
-				if(context == grammarAccess.getCPBranchTransitionRule() ||
-				   context == grammarAccess.getNonInitialTransitionRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getTransitionRule()) {
-					sequence_CPBranchTransition(context, (CPBranchTransition) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_CPBranchTransition(context, (CPBranchTransition) semanticObject); 
+				return; 
 			case FSMPackage.CHOICE_POINT:
-				if(context == grammarAccess.getChoicePointRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getStateGraphNodeRule()) {
-					sequence_ChoicePoint(context, (ChoicePoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ChoicePoint(context, (ChoicePoint) semanticObject); 
+				return; 
 			case FSMPackage.CHOICEPOINT_TERMINAL:
-				if(context == grammarAccess.getChoicepointTerminalRule() ||
-				   context == grammarAccess.getTransitionTerminalRule()) {
-					sequence_ChoicepointTerminal(context, (ChoicepointTerminal) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ChoicepointTerminal(context, (ChoicepointTerminal) semanticObject); 
+				return; 
 			case FSMPackage.CONTINUATION_TRANSITION:
-				if(context == grammarAccess.getContinuationTransitionRule() ||
-				   context == grammarAccess.getNonInitialTransitionRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getTransitionRule()) {
-					sequence_ContinuationTransition(context, (ContinuationTransition) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ContinuationTransition(context, (ContinuationTransition) semanticObject); 
+				return; 
 			case FSMPackage.DETAIL_CODE:
-				if(context == grammarAccess.getDetailCodeRule()) {
-					sequence_DetailCode(context, (DetailCode) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_DetailCode(context, (DetailCode) semanticObject); 
+				return; 
 			case FSMPackage.ENTRY_POINT:
-				if(context == grammarAccess.getEntryPointRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getStateGraphNodeRule() ||
-				   context == grammarAccess.getTrPointRule()) {
-					sequence_EntryPoint(context, (EntryPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_EntryPoint(context, (EntryPoint) semanticObject); 
+				return; 
 			case FSMPackage.EXIT_POINT:
-				if(context == grammarAccess.getExitPointRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getStateGraphNodeRule() ||
-				   context == grammarAccess.getTrPointRule()) {
-					sequence_ExitPoint(context, (ExitPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ExitPoint(context, (ExitPoint) semanticObject); 
+				return; 
 			case FSMPackage.FSM_MODEL:
-				if(context == grammarAccess.getFSMModelRule()) {
-					sequence_FSMModel(context, (FSMModel) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_FSMModel(context, (FSMModel) semanticObject); 
+				return; 
 			case FSMPackage.GUARD:
-				if(context == grammarAccess.getGuardRule()) {
-					sequence_Guard(context, (Guard) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Guard(context, (Guard) semanticObject); 
+				return; 
 			case FSMPackage.GUARDED_TRANSITION:
-				if(context == grammarAccess.getGuardedTransitionRule() ||
-				   context == grammarAccess.getNonInitialTransitionRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getTransitionRule() ||
-				   context == grammarAccess.getTransitionChainStartTransitionRule()) {
-					sequence_GuardedTransition(context, (GuardedTransition) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_GuardedTransition(context, (GuardedTransition) semanticObject); 
+				return; 
 			case FSMPackage.IN_SEMANTICS_RULE:
-				if(context == grammarAccess.getInSemanticsRuleRule() ||
-				   context == grammarAccess.getSemanticsRuleRule()) {
-					sequence_InSemanticsRule(context, (InSemanticsRule) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_InSemanticsRule(context, (InSemanticsRule) semanticObject); 
+				return; 
 			case FSMPackage.INITIAL_TRANSITION:
-				if(context == grammarAccess.getInitialTransitionRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getTransitionRule()) {
-					sequence_InitialTransition(context, (InitialTransition) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_InitialTransition(context, (InitialTransition) semanticObject); 
+				return; 
 			case FSMPackage.MESSAGE_FROM_IF:
-				if(context == grammarAccess.getMessageFromIfRule()) {
-					sequence_MessageFromIf(context, (MessageFromIf) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_MessageFromIf(context, (MessageFromIf) semanticObject); 
+				return; 
 			case FSMPackage.MODEL_COMPONENT:
-				if(context == grammarAccess.getModelComponentRule()) {
-					sequence_ModelComponent(context, (ModelComponent) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ModelComponent(context, (ModelComponent) semanticObject); 
+				return; 
 			case FSMPackage.OUT_SEMANTICS_RULE:
-				if(context == grammarAccess.getOutSemanticsRuleRule() ||
-				   context == grammarAccess.getSemanticsRuleRule()) {
-					sequence_OutSemanticsRule(context, (OutSemanticsRule) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_OutSemanticsRule(context, (OutSemanticsRule) semanticObject); 
+				return; 
 			case FSMPackage.PROTOCOL_SEMANTICS:
-				if(context == grammarAccess.getProtocolSemanticsRule()) {
-					sequence_ProtocolSemantics(context, (ProtocolSemantics) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ProtocolSemantics(context, (ProtocolSemantics) semanticObject); 
+				return; 
 			case FSMPackage.REFINED_STATE:
-				if(context == grammarAccess.getRefinedStateRule() ||
-				   context == grammarAccess.getStateRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getStateGraphNodeRule()) {
-					sequence_RefinedState(context, (RefinedState) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefinedState(context, (RefinedState) semanticObject); 
+				return; 
 			case FSMPackage.REFINED_TRANSITION:
-				if(context == grammarAccess.getRefinedTransitionRule()) {
-					sequence_RefinedTransition(context, (RefinedTransition) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefinedTransition(context, (RefinedTransition) semanticObject); 
+				return; 
 			case FSMPackage.SIMPLE_STATE:
-				if(context == grammarAccess.getSimpleStateRule() ||
-				   context == grammarAccess.getStateRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getStateGraphNodeRule()) {
-					sequence_SimpleState(context, (SimpleState) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SimpleState(context, (SimpleState) semanticObject); 
+				return; 
 			case FSMPackage.STATE_GRAPH:
-				if(context == grammarAccess.getStateGraphRule()) {
+				if (rule == grammarAccess.getStateGraphRule()) {
 					sequence_StateGraph(context, (StateGraph) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getStateMachineRule()) {
+				else if (rule == grammarAccess.getStateMachineRule()) {
 					sequence_StateMachine(context, (StateGraph) semanticObject); 
 					return; 
 				}
 				else break;
 			case FSMPackage.STATE_TERMINAL:
-				if(context == grammarAccess.getStateTerminalRule() ||
-				   context == grammarAccess.getTransitionTerminalRule()) {
-					sequence_StateTerminal(context, (StateTerminal) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_StateTerminal(context, (StateTerminal) semanticObject); 
+				return; 
 			case FSMPackage.SUB_STATE_TR_POINT_TERMINAL:
-				if(context == grammarAccess.getSubStateTrPointTerminalRule() ||
-				   context == grammarAccess.getTransitionTerminalRule()) {
-					sequence_SubStateTrPointTerminal(context, (SubStateTrPointTerminal) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SubStateTrPointTerminal(context, (SubStateTrPointTerminal) semanticObject); 
+				return; 
 			case FSMPackage.TR_POINT_TERMINAL:
-				if(context == grammarAccess.getTrPointTerminalRule() ||
-				   context == grammarAccess.getTransitionTerminalRule()) {
-					sequence_TrPointTerminal(context, (TrPointTerminal) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_TrPointTerminal(context, (TrPointTerminal) semanticObject); 
+				return; 
 			case FSMPackage.TRANSITION_POINT:
-				if(context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getStateGraphNodeRule() ||
-				   context == grammarAccess.getTrPointRule() ||
-				   context == grammarAccess.getTransitionPointRule()) {
-					sequence_TransitionPoint(context, (TransitionPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_TransitionPoint(context, (TransitionPoint) semanticObject); 
+				return; 
 			case FSMPackage.TRIGGER:
-				if(context == grammarAccess.getTriggerRule()) {
-					sequence_Trigger(context, (Trigger) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Trigger(context, (Trigger) semanticObject); 
+				return; 
 			case FSMPackage.TRIGGERED_TRANSITION:
-				if(context == grammarAccess.getNonInitialTransitionRule() ||
-				   context == grammarAccess.getStateGraphItemRule() ||
-				   context == grammarAccess.getTransitionRule() ||
-				   context == grammarAccess.getTransitionChainStartTransitionRule() ||
-				   context == grammarAccess.getTriggeredTransitionRule()) {
-					sequence_TriggeredTransition(context, (TriggeredTransition) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_TriggeredTransition(context, (TriggeredTransition) semanticObject); 
+				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     AbstractInterfaceItem returns AbstractInterfaceItem
+	 *
 	 * Constraint:
 	 *     name=ID
 	 */
-	protected void sequence_AbstractInterfaceItem(EObject context, AbstractInterfaceItem semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.ABSTRACT_INTERFACE_ITEM__NAME) == ValueTransient.YES)
+	protected void sequence_AbstractInterfaceItem(ISerializationContext context, AbstractInterfaceItem semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.ABSTRACT_INTERFACE_ITEM__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.ABSTRACT_INTERFACE_ITEM__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getAbstractInterfaceItemAccess().getNameIDTerminalRuleCall_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphItem returns CPBranchTransition
+	 *     TransitionBase returns CPBranchTransition
+	 *     Transition returns CPBranchTransition
+	 *     NonInitialTransition returns CPBranchTransition
+	 *     CPBranchTransition returns CPBranchTransition
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID? 
@@ -382,112 +239,153 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	 *         action=DetailCode?
 	 *     )
 	 */
-	protected void sequence_CPBranchTransition(EObject context, CPBranchTransition semanticObject) {
+	protected void sequence_CPBranchTransition(ISerializationContext context, CPBranchTransition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphNode returns ChoicePoint
+	 *     StateGraphItem returns ChoicePoint
+	 *     ChoicePoint returns ChoicePoint
+	 *
 	 * Constraint:
 	 *     (name=ID docu=Documentation?)
 	 */
-	protected void sequence_ChoicePoint(EObject context, ChoicePoint semanticObject) {
+	protected void sequence_ChoicePoint(ISerializationContext context, ChoicePoint semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     TransitionTerminal returns ChoicepointTerminal
+	 *     ChoicepointTerminal returns ChoicepointTerminal
+	 *
 	 * Constraint:
 	 *     cp=[ChoicePoint|ID]
 	 */
-	protected void sequence_ChoicepointTerminal(EObject context, ChoicepointTerminal semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.CHOICEPOINT_TERMINAL__CP) == ValueTransient.YES)
+	protected void sequence_ChoicepointTerminal(ISerializationContext context, ChoicepointTerminal semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.CHOICEPOINT_TERMINAL__CP) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.CHOICEPOINT_TERMINAL__CP));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointIDTerminalRuleCall_1_0_1(), semanticObject.getCp());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphItem returns ContinuationTransition
+	 *     TransitionBase returns ContinuationTransition
+	 *     Transition returns ContinuationTransition
+	 *     NonInitialTransition returns ContinuationTransition
+	 *     ContinuationTransition returns ContinuationTransition
+	 *
 	 * Constraint:
 	 *     (name=ID? from=TransitionTerminal to=TransitionTerminal docu=Documentation? action=DetailCode?)
 	 */
-	protected void sequence_ContinuationTransition(EObject context, ContinuationTransition semanticObject) {
+	protected void sequence_ContinuationTransition(ISerializationContext context, ContinuationTransition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     DetailCode returns DetailCode
+	 *
 	 * Constraint:
 	 *     (used?='{' lines+=STRING*)
 	 */
-	protected void sequence_DetailCode(EObject context, DetailCode semanticObject) {
+	protected void sequence_DetailCode(ISerializationContext context, DetailCode semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphNode returns EntryPoint
+	 *     StateGraphItem returns EntryPoint
+	 *     TrPoint returns EntryPoint
+	 *     EntryPoint returns EntryPoint
+	 *
 	 * Constraint:
 	 *     name=ID
 	 */
-	protected void sequence_EntryPoint(EObject context, EntryPoint semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.TR_POINT__NAME) == ValueTransient.YES)
+	protected void sequence_EntryPoint(ISerializationContext context, EntryPoint semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.TR_POINT__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.TR_POINT__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphNode returns ExitPoint
+	 *     StateGraphItem returns ExitPoint
+	 *     TrPoint returns ExitPoint
+	 *     ExitPoint returns ExitPoint
+	 *
 	 * Constraint:
 	 *     name=ID
 	 */
-	protected void sequence_ExitPoint(EObject context, ExitPoint semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.TR_POINT__NAME) == ValueTransient.YES)
+	protected void sequence_ExitPoint(ISerializationContext context, ExitPoint semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.TR_POINT__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.TR_POINT__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     FSMModel returns FSMModel
+	 *
 	 * Constraint:
-	 *     components+=ModelComponent*
+	 *     components+=ModelComponent+
 	 */
-	protected void sequence_FSMModel(EObject context, FSMModel semanticObject) {
+	protected void sequence_FSMModel(ISerializationContext context, FSMModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Guard returns Guard
+	 *
 	 * Constraint:
 	 *     guard=DetailCode
 	 */
-	protected void sequence_Guard(EObject context, Guard semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.GUARD__GUARD) == ValueTransient.YES)
+	protected void sequence_Guard(ISerializationContext context, Guard semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.GUARD__GUARD) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.GUARD__GUARD));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getGuardAccess().getGuardDetailCodeParserRuleCall_1_0(), semanticObject.getGuard());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphItem returns GuardedTransition
+	 *     TransitionBase returns GuardedTransition
+	 *     Transition returns GuardedTransition
+	 *     NonInitialTransition returns GuardedTransition
+	 *     TransitionChainStartTransition returns GuardedTransition
+	 *     GuardedTransition returns GuardedTransition
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID? 
@@ -498,42 +396,54 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	 *         action=DetailCode?
 	 *     )
 	 */
-	protected void sequence_GuardedTransition(EObject context, GuardedTransition semanticObject) {
+	protected void sequence_GuardedTransition(ISerializationContext context, GuardedTransition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SemanticsRule returns InSemanticsRule
+	 *     InSemanticsRule returns InSemanticsRule
+	 *
 	 * Constraint:
 	 *     (msg=[EObject|ID] (followUps+=SemanticsRule | (followUps+=SemanticsRule followUps+=SemanticsRule+))?)
 	 */
-	protected void sequence_InSemanticsRule(EObject context, InSemanticsRule semanticObject) {
+	protected void sequence_InSemanticsRule(ISerializationContext context, InSemanticsRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphItem returns InitialTransition
+	 *     TransitionBase returns InitialTransition
+	 *     Transition returns InitialTransition
+	 *     InitialTransition returns InitialTransition
+	 *
 	 * Constraint:
 	 *     (name=ID? to=TransitionTerminal docu=Documentation? action=DetailCode?)
 	 */
-	protected void sequence_InitialTransition(EObject context, InitialTransition semanticObject) {
+	protected void sequence_InitialTransition(ISerializationContext context, InitialTransition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     MessageFromIf returns MessageFromIf
+	 *
 	 * Constraint:
 	 *     (message=[EObject|ID] from=[AbstractInterfaceItem|ID])
 	 */
-	protected void sequence_MessageFromIf(EObject context, MessageFromIf semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.MESSAGE_FROM_IF__MESSAGE) == ValueTransient.YES)
+	protected void sequence_MessageFromIf(ISerializationContext context, MessageFromIf semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.MESSAGE_FROM_IF__MESSAGE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.MESSAGE_FROM_IF__MESSAGE));
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.MESSAGE_FROM_IF__FROM) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.MESSAGE_FROM_IF__FROM) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.MESSAGE_FROM_IF__FROM));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getMessageFromIfAccess().getMessageEObjectIDTerminalRuleCall_0_0_1(), semanticObject.getMessage());
 		feeder.accept(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemIDTerminalRuleCall_2_0_1(), semanticObject.getFrom());
 		feeder.finish();
@@ -541,33 +451,49 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     ModelComponent returns ModelComponent
+	 *
 	 * Constraint:
-	 *     (abstract?='abstract'? commType=ComponentCommunicationType? componentName=ID base=[ModelComponent|FQN]? stateMachine=StateMachine)
+	 *     ((abstract?='abstract' | commType=ComponentCommunicationType)* componentName=ID base=[ModelComponent|FQN]? stateMachine=StateMachine)
 	 */
-	protected void sequence_ModelComponent(EObject context, ModelComponent semanticObject) {
+	protected void sequence_ModelComponent(ISerializationContext context, ModelComponent semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SemanticsRule returns OutSemanticsRule
+	 *     OutSemanticsRule returns OutSemanticsRule
+	 *
 	 * Constraint:
 	 *     (msg=[EObject|ID] (followUps+=SemanticsRule | (followUps+=SemanticsRule followUps+=SemanticsRule+))?)
 	 */
-	protected void sequence_OutSemanticsRule(EObject context, OutSemanticsRule semanticObject) {
+	protected void sequence_OutSemanticsRule(ISerializationContext context, OutSemanticsRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ProtocolSemantics returns ProtocolSemantics
+	 *
 	 * Constraint:
-	 *     (rules+=SemanticsRule*)
+	 *     rules+=SemanticsRule*
 	 */
-	protected void sequence_ProtocolSemantics(EObject context, ProtocolSemantics semanticObject) {
+	protected void sequence_ProtocolSemantics(ISerializationContext context, ProtocolSemantics semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphNode returns RefinedState
+	 *     StateGraphItem returns RefinedState
+	 *     State returns RefinedState
+	 *     RefinedState returns RefinedState
+	 *
 	 * Constraint:
 	 *     (
 	 *         target=[State|FQN] 
@@ -578,76 +504,105 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	 *         subgraph=StateGraph?
 	 *     )
 	 */
-	protected void sequence_RefinedState(EObject context, RefinedState semanticObject) {
+	protected void sequence_RefinedState(ISerializationContext context, RefinedState semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     TransitionBase returns RefinedTransition
+	 *     RefinedTransition returns RefinedTransition
+	 *
 	 * Constraint:
 	 *     (target=[Transition|FQN] docu=Documentation? action=DetailCode)
 	 */
-	protected void sequence_RefinedTransition(EObject context, RefinedTransition semanticObject) {
+	protected void sequence_RefinedTransition(ISerializationContext context, RefinedTransition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphNode returns SimpleState
+	 *     StateGraphItem returns SimpleState
+	 *     State returns SimpleState
+	 *     SimpleState returns SimpleState
+	 *
 	 * Constraint:
-	 *     (name=ID docu=Documentation? (entryCode=DetailCode? exitCode=DetailCode? doCode=DetailCode? subgraph=StateGraph?)?)
+	 *     (
+	 *         name=ID 
+	 *         docu=Documentation? 
+	 *         entryCode=DetailCode? 
+	 *         exitCode=DetailCode? 
+	 *         doCode=DetailCode? 
+	 *         subgraph=StateGraph?
+	 *     )
 	 */
-	protected void sequence_SimpleState(EObject context, SimpleState semanticObject) {
+	protected void sequence_SimpleState(ISerializationContext context, SimpleState semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraph returns StateGraph
+	 *
 	 * Constraint:
-	 *     ((states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | refinedTransitions+=RefinedTransition)*)
+	 *     (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | refinedTransitions+=RefinedTransition)*
 	 */
-	protected void sequence_StateGraph(EObject context, StateGraph semanticObject) {
+	protected void sequence_StateGraph(ISerializationContext context, StateGraph semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateMachine returns StateGraph
+	 *
 	 * Constraint:
-	 *     ((states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | refinedTransitions+=RefinedTransition)*)
+	 *     (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | refinedTransitions+=RefinedTransition)*
 	 */
-	protected void sequence_StateMachine(EObject context, StateGraph semanticObject) {
+	protected void sequence_StateMachine(ISerializationContext context, StateGraph semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     TransitionTerminal returns StateTerminal
+	 *     StateTerminal returns StateTerminal
+	 *
 	 * Constraint:
 	 *     state=[State|ID]
 	 */
-	protected void sequence_StateTerminal(EObject context, StateTerminal semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.STATE_TERMINAL__STATE) == ValueTransient.YES)
+	protected void sequence_StateTerminal(ISerializationContext context, StateTerminal semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.STATE_TERMINAL__STATE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.STATE_TERMINAL__STATE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getStateTerminalAccess().getStateStateIDTerminalRuleCall_0_1(), semanticObject.getState());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     TransitionTerminal returns SubStateTrPointTerminal
+	 *     SubStateTrPointTerminal returns SubStateTrPointTerminal
+	 *
 	 * Constraint:
 	 *     (trPoint=[TrPoint|ID] state=[State|ID])
 	 */
-	protected void sequence_SubStateTrPointTerminal(EObject context, SubStateTrPointTerminal semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.SUB_STATE_TR_POINT_TERMINAL__TR_POINT) == ValueTransient.YES)
+	protected void sequence_SubStateTrPointTerminal(ISerializationContext context, SubStateTrPointTerminal semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.SUB_STATE_TR_POINT_TERMINAL__TR_POINT) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.SUB_STATE_TR_POINT_TERMINAL__TR_POINT));
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.SUB_STATE_TR_POINT_TERMINAL__STATE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.SUB_STATE_TR_POINT_TERMINAL__STATE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.SUB_STATE_TR_POINT_TERMINAL__STATE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_0_0_1(), semanticObject.getTrPoint());
 		feeder.accept(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateIDTerminalRuleCall_2_0_1(), semanticObject.getState());
 		feeder.finish();
@@ -655,40 +610,60 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     TransitionTerminal returns TrPointTerminal
+	 *     TrPointTerminal returns TrPointTerminal
+	 *
 	 * Constraint:
 	 *     trPoint=[TrPoint|ID]
 	 */
-	protected void sequence_TrPointTerminal(EObject context, TrPointTerminal semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.TR_POINT_TERMINAL__TR_POINT) == ValueTransient.YES)
+	protected void sequence_TrPointTerminal(ISerializationContext context, TrPointTerminal semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FSMPackage.Literals.TR_POINT_TERMINAL__TR_POINT) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FSMPackage.Literals.TR_POINT_TERMINAL__TR_POINT));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_1_0_1(), semanticObject.getTrPoint());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphNode returns TransitionPoint
+	 *     StateGraphItem returns TransitionPoint
+	 *     TrPoint returns TransitionPoint
+	 *     TransitionPoint returns TransitionPoint
+	 *
 	 * Constraint:
 	 *     (handler?='handler'? name=ID)
 	 */
-	protected void sequence_TransitionPoint(EObject context, TransitionPoint semanticObject) {
+	protected void sequence_TransitionPoint(ISerializationContext context, TransitionPoint semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Trigger returns Trigger
+	 *
 	 * Constraint:
 	 *     (msgFromIfPairs+=MessageFromIf msgFromIfPairs+=MessageFromIf* guard=Guard?)
 	 */
-	protected void sequence_Trigger(EObject context, Trigger semanticObject) {
+	protected void sequence_Trigger(ISerializationContext context, Trigger semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StateGraphItem returns TriggeredTransition
+	 *     TransitionBase returns TriggeredTransition
+	 *     Transition returns TriggeredTransition
+	 *     NonInitialTransition returns TriggeredTransition
+	 *     TransitionChainStartTransition returns TriggeredTransition
+	 *     TriggeredTransition returns TriggeredTransition
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID? 
@@ -700,7 +675,9 @@ public class FSMSemanticSequencer extends BaseSemanticSequencer {
 	 *         action=DetailCode?
 	 *     )
 	 */
-	protected void sequence_TriggeredTransition(EObject context, TriggeredTransition semanticObject) {
+	protected void sequence_TriggeredTransition(ISerializationContext context, TriggeredTransition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSyntacticSequencer.java
index 7dbe9553b..3600abf48 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/serializer/FSMSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.serializer;
 
 import com.google.inject.Inject;
@@ -42,35 +45,47 @@ public class FSMSyntacticSequencer extends AbstractSyntacticSequencer {
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_ContinuationTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q.equals(syntax))
+			if (match_ContinuationTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q.equals(syntax))
 				emit_ContinuationTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_InitialTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q.equals(syntax))
+			else if (match_InitialTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q.equals(syntax))
 				emit_InitialTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_SimpleState___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_5__q.equals(syntax))
+			else if (match_SimpleState___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_5__q.equals(syntax))
 				emit_SimpleState___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_5__q(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
 	}
 
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     docu=Documentation (ambiguity) (rule end)
+	 *     to=TransitionTerminal (ambiguity) (rule end)
 	 */
 	protected void emit_ContinuationTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     docu=Documentation (ambiguity) (rule end)
+	 *     to=TransitionTerminal (ambiguity) (rule end)
 	 */
 	protected void emit_InitialTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     docu=Documentation (ambiguity) (rule end)
+	 *     name=ID (ambiguity) (rule end)
 	 */
 	protected void emit_SimpleState___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_5__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/services/FSMGrammarAccess.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/services/FSMGrammarAccess.java
index cf5228ce9..71057c7c6 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/services/FSMGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/services/FSMGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.services;
 
 import com.google.inject.Singleton;
@@ -13,19 +13,20 @@ import org.eclipse.xtext.service.GrammarProvider;
 import org.eclipse.xtext.service.AbstractElementFinder.*;
 
 import org.eclipse.etrice.core.common.services.BaseGrammarAccess;
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
 
 @Singleton
 public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class FSMModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FSMModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.FSMModel");
 		private final Assignment cComponentsAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cComponentsModelComponentParserRuleCall_0 = (RuleCall)cComponentsAssignment.eContents().get(0);
 		
 		//FSMModel:
 		//	components+=ModelComponent*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//components+=ModelComponent*
 		public Assignment getComponentsAssignment() { return cComponentsAssignment; }
@@ -35,7 +36,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ModelComponentElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ModelComponent");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ModelComponent");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final UnorderedGroup cUnorderedGroup_0 = (UnorderedGroup)cGroup.eContents().get(0);
 		private final Assignment cAbstractAssignment_0_0 = (Assignment)cUnorderedGroup_0.eContents().get(0);
@@ -55,21 +56,22 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//// the owner of a state machine. It also implements inheritance
 		//ModelComponent:
-		//	(abstract?="abstract"? & commType=ComponentCommunicationType?) "ModelComponent" componentName=ID ("extends"
-		//	base=[ModelComponent|FQN])? stateMachine=StateMachine;
-		public ParserRule getRule() { return rule; }
+		//	(abstract?='abstract'? & commType=ComponentCommunicationType?)
+		//	'ModelComponent' componentName=ID ('extends' base=[ModelComponent|FQN])?
+		//	stateMachine=StateMachine;
+		@Override public ParserRule getRule() { return rule; }
 
-		//(abstract?="abstract"? & commType=ComponentCommunicationType?) "ModelComponent" componentName=ID ("extends"
+		//(abstract?='abstract'? & commType=ComponentCommunicationType?) 'ModelComponent' componentName=ID ('extends'
 		//base=[ModelComponent|FQN])? stateMachine=StateMachine
 		public Group getGroup() { return cGroup; }
 
-		//abstract?="abstract"? & commType=ComponentCommunicationType?
+		//(abstract?='abstract'? & commType=ComponentCommunicationType?)
 		public UnorderedGroup getUnorderedGroup_0() { return cUnorderedGroup_0; }
 
-		//abstract?="abstract"?
+		//abstract?='abstract'?
 		public Assignment getAbstractAssignment_0_0() { return cAbstractAssignment_0_0; }
 
-		//"abstract"
+		//'abstract'
 		public Keyword getAbstractAbstractKeyword_0_0_0() { return cAbstractAbstractKeyword_0_0_0; }
 
 		//commType=ComponentCommunicationType?
@@ -78,7 +80,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ComponentCommunicationType
 		public RuleCall getCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0() { return cCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0; }
 
-		//"ModelComponent"
+		//'ModelComponent'
 		public Keyword getModelComponentKeyword_1() { return cModelComponentKeyword_1; }
 
 		//componentName=ID
@@ -87,10 +89,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getComponentNameIDTerminalRuleCall_2_0() { return cComponentNameIDTerminalRuleCall_2_0; }
 
-		//("extends" base=[ModelComponent|FQN])?
+		//('extends' base=[ModelComponent|FQN])?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"extends"
+		//'extends'
 		public Keyword getExtendsKeyword_3_0() { return cExtendsKeyword_3_0; }
 
 		//base=[ModelComponent|FQN]
@@ -110,7 +112,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StateGraphNodeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StateGraphNode");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.StateGraphNode");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cStateParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cChoicePointParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -122,7 +124,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//// the building blocks of a state machine: nodes and items
 		//StateGraphNode:
 		//	State | ChoicePoint | TrPoint;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//State | ChoicePoint | TrPoint
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -138,14 +140,14 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StateGraphItemElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StateGraphItem");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.StateGraphItem");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cStateGraphNodeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//StateGraphItem:
 		//	StateGraphNode | Transition;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//StateGraphNode | Transition
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -158,7 +160,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StateGraphElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StateGraph");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.StateGraph");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cStateGraphAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -177,18 +179,20 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//// state graph and state machine are two rules for the same model class
 		//StateGraph:
-		//	{StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
-		//	refinedTransitions+=RefinedTransition)* "}";
-		public ParserRule getRule() { return rule; }
-
-		//{StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
-		//refinedTransitions+=RefinedTransition)* "}"
+		//	{StateGraph}
+		//	'{' (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
+		//	refinedTransitions+=RefinedTransition)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//{StateGraph} '{' (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
+		//refinedTransitions+=RefinedTransition)* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{StateGraph}
 		public Action getStateGraphAction_0() { return cStateGraphAction_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
 
 		//(states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
@@ -225,12 +229,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//RefinedTransition
 		public RuleCall getRefinedTransitionsRefinedTransitionParserRuleCall_2_4_0() { return cRefinedTransitionsRefinedTransitionParserRuleCall_2_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
 	}
 
 	public class StateMachineElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StateMachine");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.StateMachine");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cStateGraphAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cStateMachineKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -248,22 +252,24 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0 = (RuleCall)cRefinedTransitionsAssignment_3_4.eContents().get(0);
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
-		//StateMachine returns StateGraph:
-		//	{StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition
-		//	| refinedTransitions+=RefinedTransition)* "}";
-		public ParserRule getRule() { return rule; }
-
-		//{StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
-		//refinedTransitions+=RefinedTransition)* "}"
+		//StateMachine StateGraph:
+		//	{StateGraph}
+		//	'StateMachine' '{' (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
+		//	refinedTransitions+=RefinedTransition)*
+		//	'}'
+		@Override public ParserRule getRule() { return rule; }
+
+		//{StateGraph} 'StateMachine' '{' (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
+		//refinedTransitions+=RefinedTransition)* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{StateGraph}
 		public Action getStateGraphAction_0() { return cStateGraphAction_0; }
 
-		//"StateMachine"
+		//'StateMachine'
 		public Keyword getStateMachineKeyword_1() { return cStateMachineKeyword_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//(states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
@@ -300,12 +306,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//RefinedTransition
 		public RuleCall getRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0() { return cRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class StateElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "State");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.State");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSimpleStateParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cRefinedStateParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -315,7 +321,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		////
 		//State:
 		//	SimpleState | RefinedState;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//SimpleState | RefinedState
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -328,7 +334,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SimpleStateElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleState");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.SimpleState");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cStateKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -356,15 +362,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_3_5 = (Keyword)cGroup_3.eContents().get(5);
 		
 		//SimpleState:
-		//	"State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do"
-		//	doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?;
-		public ParserRule getRule() { return rule; }
+		//	'State' name=ID docu=Documentation? ('{' ('entry' entryCode=DetailCode)? ('exit' exitCode=DetailCode)? ('do'
+		//	doCode=DetailCode)? ('subgraph' subgraph=StateGraph)?
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do"
-		//doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?
+		//'State' name=ID docu=Documentation? ('{' ('entry' entryCode=DetailCode)? ('exit' exitCode=DetailCode)? ('do'
+		//doCode=DetailCode)? ('subgraph' subgraph=StateGraph)? '}')?
 		public Group getGroup() { return cGroup; }
 
-		//"State"
+		//'State'
 		public Keyword getStateKeyword_0() { return cStateKeyword_0; }
 
 		//name=ID
@@ -379,17 +386,17 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph"
-		//subgraph=StateGraph)? "}")?
+		//('{' ('entry' entryCode=DetailCode)? ('exit' exitCode=DetailCode)? ('do' doCode=DetailCode)? ('subgraph'
+		//subgraph=StateGraph)? '}')?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
 
-		//("entry" entryCode=DetailCode)?
+		//('entry' entryCode=DetailCode)?
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//"entry"
+		//'entry'
 		public Keyword getEntryKeyword_3_1_0() { return cEntryKeyword_3_1_0; }
 
 		//entryCode=DetailCode
@@ -398,10 +405,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getEntryCodeDetailCodeParserRuleCall_3_1_1_0() { return cEntryCodeDetailCodeParserRuleCall_3_1_1_0; }
 
-		//("exit" exitCode=DetailCode)?
+		//('exit' exitCode=DetailCode)?
 		public Group getGroup_3_2() { return cGroup_3_2; }
 
-		//"exit"
+		//'exit'
 		public Keyword getExitKeyword_3_2_0() { return cExitKeyword_3_2_0; }
 
 		//exitCode=DetailCode
@@ -410,10 +417,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getExitCodeDetailCodeParserRuleCall_3_2_1_0() { return cExitCodeDetailCodeParserRuleCall_3_2_1_0; }
 
-		//("do" doCode=DetailCode)?
+		//('do' doCode=DetailCode)?
 		public Group getGroup_3_3() { return cGroup_3_3; }
 
-		//"do"
+		//'do'
 		public Keyword getDoKeyword_3_3_0() { return cDoKeyword_3_3_0; }
 
 		//doCode=DetailCode
@@ -422,10 +429,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getDoCodeDetailCodeParserRuleCall_3_3_1_0() { return cDoCodeDetailCodeParserRuleCall_3_3_1_0; }
 
-		//("subgraph" subgraph=StateGraph)?
+		//('subgraph' subgraph=StateGraph)?
 		public Group getGroup_3_4() { return cGroup_3_4; }
 
-		//"subgraph"
+		//'subgraph'
 		public Keyword getSubgraphKeyword_3_4_0() { return cSubgraphKeyword_3_4_0; }
 
 		//subgraph=StateGraph
@@ -434,12 +441,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//StateGraph
 		public RuleCall getSubgraphStateGraphParserRuleCall_3_4_1_0() { return cSubgraphStateGraphParserRuleCall_3_4_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3_5() { return cRightCurlyBracketKeyword_3_5; }
 	}
 
 	public class RefinedStateElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefinedState");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.RefinedState");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRefinedStateKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTargetAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -467,15 +474,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);
 		
 		//RefinedState:
-		//	"RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit"
-		//	exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}";
-		public ParserRule getRule() { return rule; }
+		//	'RefinedState' target=[State|FQN] docu=Documentation? '{' ('entry' entryCode=DetailCode)? ('exit'
+		//	exitCode=DetailCode)? ('do' doCode=DetailCode)? ('subgraph' subgraph=StateGraph)?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)?
-		//("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}"
+		//'RefinedState' target=[State|FQN] docu=Documentation? '{' ('entry' entryCode=DetailCode)? ('exit' exitCode=DetailCode)?
+		//('do' doCode=DetailCode)? ('subgraph' subgraph=StateGraph)? '}'
 		public Group getGroup() { return cGroup; }
 
-		//"RefinedState"
+		//'RefinedState'
 		public Keyword getRefinedStateKeyword_0() { return cRefinedStateKeyword_0; }
 
 		//target=[State|FQN]
@@ -493,13 +501,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
-		//("entry" entryCode=DetailCode)?
+		//('entry' entryCode=DetailCode)?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"entry"
+		//'entry'
 		public Keyword getEntryKeyword_4_0() { return cEntryKeyword_4_0; }
 
 		//entryCode=DetailCode
@@ -508,10 +516,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getEntryCodeDetailCodeParserRuleCall_4_1_0() { return cEntryCodeDetailCodeParserRuleCall_4_1_0; }
 
-		//("exit" exitCode=DetailCode)?
+		//('exit' exitCode=DetailCode)?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//"exit"
+		//'exit'
 		public Keyword getExitKeyword_5_0() { return cExitKeyword_5_0; }
 
 		//exitCode=DetailCode
@@ -520,10 +528,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getExitCodeDetailCodeParserRuleCall_5_1_0() { return cExitCodeDetailCodeParserRuleCall_5_1_0; }
 
-		//("do" doCode=DetailCode)?
+		//('do' doCode=DetailCode)?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"do"
+		//'do'
 		public Keyword getDoKeyword_6_0() { return cDoKeyword_6_0; }
 
 		//doCode=DetailCode
@@ -532,10 +540,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getDoCodeDetailCodeParserRuleCall_6_1_0() { return cDoCodeDetailCodeParserRuleCall_6_1_0; }
 
-		//("subgraph" subgraph=StateGraph)?
+		//('subgraph' subgraph=StateGraph)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"subgraph"
+		//'subgraph'
 		public Keyword getSubgraphKeyword_7_0() { return cSubgraphKeyword_7_0; }
 
 		//subgraph=StateGraph
@@ -544,12 +552,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//StateGraph
 		public RuleCall getSubgraphStateGraphParserRuleCall_7_1_0() { return cSubgraphStateGraphParserRuleCall_7_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_8() { return cRightCurlyBracketKeyword_8; }
 	}
 
 	public class DetailCodeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DetailCode");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.DetailCode");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cDetailCodeAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cUsedAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -561,19 +569,21 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//// the detail level (or target language) code
 		//// the used flag might be used when overriding in derived grammars
 		//DetailCode:
-		//	{DetailCode} used?="{" lines+=STRING* "}";
-		public ParserRule getRule() { return rule; }
+		//	{DetailCode} used?='{'
+		//	lines+=STRING*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//{DetailCode} used?="{" lines+=STRING* "}"
+		//{DetailCode} used?='{' lines+=STRING* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{DetailCode}
 		public Action getDetailCodeAction_0() { return cDetailCodeAction_0; }
 
-		//used?="{"
+		//used?='{'
 		public Assignment getUsedAssignment_1() { return cUsedAssignment_1; }
 
-		//"{"
+		//'{'
 		public Keyword getUsedLeftCurlyBracketKeyword_1_0() { return cUsedLeftCurlyBracketKeyword_1_0; }
 
 		//lines+=STRING*
@@ -582,12 +592,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getLinesSTRINGTerminalRuleCall_2_0() { return cLinesSTRINGTerminalRuleCall_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
 	}
 
 	public class TrPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TrPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TrPoint");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cTransitionPointParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cEntryPointParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -598,7 +608,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		////
 		//TrPoint:
 		//	TransitionPoint | EntryPoint | ExitPoint;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//TransitionPoint | EntryPoint | ExitPoint
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -614,7 +624,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class TransitionPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TransitionPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TransitionPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cHandlerAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cHandlerHandlerKeyword_0_0 = (Keyword)cHandlerAssignment_0.eContents().get(0);
@@ -623,19 +633,19 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
 		
 		//TransitionPoint:
-		//	handler?="handler"? "TransitionPoint" name=ID;
-		public ParserRule getRule() { return rule; }
+		//	handler?='handler'? 'TransitionPoint' name=ID;
+		@Override public ParserRule getRule() { return rule; }
 
-		//handler?="handler"? "TransitionPoint" name=ID
+		//handler?='handler'? 'TransitionPoint' name=ID
 		public Group getGroup() { return cGroup; }
 
-		//handler?="handler"?
+		//handler?='handler'?
 		public Assignment getHandlerAssignment_0() { return cHandlerAssignment_0; }
 
-		//"handler"
+		//'handler'
 		public Keyword getHandlerHandlerKeyword_0_0() { return cHandlerHandlerKeyword_0_0; }
 
-		//"TransitionPoint"
+		//'TransitionPoint'
 		public Keyword getTransitionPointKeyword_1() { return cTransitionPointKeyword_1; }
 
 		//name=ID
@@ -646,20 +656,20 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class EntryPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EntryPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.EntryPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cEntryPointKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
 		
 		//EntryPoint:
-		//	"EntryPoint" name=ID;
-		public ParserRule getRule() { return rule; }
+		//	'EntryPoint' name=ID;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"EntryPoint" name=ID
+		//'EntryPoint' name=ID
 		public Group getGroup() { return cGroup; }
 
-		//"EntryPoint"
+		//'EntryPoint'
 		public Keyword getEntryPointKeyword_0() { return cEntryPointKeyword_0; }
 
 		//name=ID
@@ -670,20 +680,20 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ExitPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ExitPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ExitPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cExitPointKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
 		
 		//ExitPoint:
-		//	"ExitPoint" name=ID;
-		public ParserRule getRule() { return rule; }
+		//	'ExitPoint' name=ID;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ExitPoint" name=ID
+		//'ExitPoint' name=ID
 		public Group getGroup() { return cGroup; }
 
-		//"ExitPoint"
+		//'ExitPoint'
 		public Keyword getExitPointKeyword_0() { return cExitPointKeyword_0; }
 
 		//name=ID
@@ -694,7 +704,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ChoicePointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ChoicePoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cChoicePointKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -706,13 +716,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//// choice point
 		////
 		//ChoicePoint:
-		//	"ChoicePoint" name=ID docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	'ChoicePoint' name=ID docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ChoicePoint" name=ID docu=Documentation?
+		//'ChoicePoint' name=ID docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//"ChoicePoint"
+		//'ChoicePoint'
 		public Keyword getChoicePointKeyword_0() { return cChoicePointKeyword_0; }
 
 		//name=ID
@@ -728,18 +738,38 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 	}
 
-	public class TransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Transition");
+	public class TransitionBaseElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TransitionBase");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final RuleCall cInitialTransitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-		private final RuleCall cNonInitialTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+		private final RuleCall cTransitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall cRefinedTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		////
 		//// transitions
 		////
+		//TransitionBase:
+		//	Transition | RefinedTransition;
+		@Override public ParserRule getRule() { return rule; }
+
+		//Transition | RefinedTransition
+		public Alternatives getAlternatives() { return cAlternatives; }
+
+		//Transition
+		public RuleCall getTransitionParserRuleCall_0() { return cTransitionParserRuleCall_0; }
+
+		//RefinedTransition
+		public RuleCall getRefinedTransitionParserRuleCall_1() { return cRefinedTransitionParserRuleCall_1; }
+	}
+
+	public class TransitionElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.Transition");
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall cInitialTransitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall cNonInitialTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+		
 		//Transition:
 		//	InitialTransition | NonInitialTransition;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//InitialTransition | NonInitialTransition
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -752,7 +782,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class NonInitialTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NonInitialTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.NonInitialTransition");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cTransitionChainStartTransitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cContinuationTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -760,7 +790,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//NonInitialTransition:
 		//	TransitionChainStartTransition | ContinuationTransition | CPBranchTransition;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//TransitionChainStartTransition | ContinuationTransition | CPBranchTransition
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -776,14 +806,14 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class TransitionChainStartTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TransitionChainStartTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TransitionChainStartTransition");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cTriggeredTransitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cGuardedTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//TransitionChainStartTransition:
 		//	TriggeredTransition | GuardedTransition;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//TriggeredTransition | GuardedTransition
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -796,7 +826,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class InitialTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InitialTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.InitialTransition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cTransitionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -817,15 +847,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_7_2 = (Keyword)cGroup_7.eContents().get(2);
 		
 		//InitialTransition:
-		//	"Transition" name=ID? ":" "initial" "->" to=TransitionTerminal docu=Documentation? ("{" ("action" action=DetailCode)?
-		//	"}")?;
-		public ParserRule getRule() { return rule; }
+		//	'Transition' name=ID? ':' 'initial' '->' to=TransitionTerminal
+		//	docu=Documentation? ('{' ('action' action=DetailCode)?
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"Transition" name=ID? ":" "initial" "->" to=TransitionTerminal docu=Documentation? ("{" ("action" action=DetailCode)?
-		//"}")?
+		//'Transition' name=ID? ':' 'initial' '->' to=TransitionTerminal docu=Documentation? ('{' ('action' action=DetailCode)?
+		//'}')?
 		public Group getGroup() { return cGroup; }
 
-		//"Transition"
+		//'Transition'
 		public Keyword getTransitionKeyword_0() { return cTransitionKeyword_0; }
 
 		//name=ID?
@@ -834,13 +865,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
-		//"initial"
+		//'initial'
 		public Keyword getInitialKeyword_3() { return cInitialKeyword_3; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_4() { return cHyphenMinusGreaterThanSignKeyword_4; }
 
 		//to=TransitionTerminal
@@ -855,16 +886,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_6_0() { return cDocuDocumentationParserRuleCall_6_0; }
 
-		//("{" ("action" action=DetailCode)? "}")?
+		//('{' ('action' action=DetailCode)? '}')?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_7_0() { return cLeftCurlyBracketKeyword_7_0; }
 
-		//("action" action=DetailCode)?
+		//('action' action=DetailCode)?
 		public Group getGroup_7_1() { return cGroup_7_1; }
 
-		//"action"
+		//'action'
 		public Keyword getActionKeyword_7_1_0() { return cActionKeyword_7_1_0; }
 
 		//action=DetailCode
@@ -873,12 +904,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getActionDetailCodeParserRuleCall_7_1_1_0() { return cActionDetailCodeParserRuleCall_7_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7_2() { return cRightCurlyBracketKeyword_7_2; }
 	}
 
 	public class ContinuationTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ContinuationTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ContinuationTransition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cTransitionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -900,15 +931,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_7_2 = (Keyword)cGroup_7.eContents().get(2);
 		
 		//ContinuationTransition:
-		//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action"
-		//	action=DetailCode)? "}")?;
-		public ParserRule getRule() { return rule; }
+		//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+		//	docu=Documentation? ('{' ('action' action=DetailCode)?
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action"
-		//action=DetailCode)? "}")?
+		//'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal docu=Documentation? ('{' ('action'
+		//action=DetailCode)? '}')?
 		public Group getGroup() { return cGroup; }
 
-		//"Transition"
+		//'Transition'
 		public Keyword getTransitionKeyword_0() { return cTransitionKeyword_0; }
 
 		//name=ID?
@@ -917,7 +949,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//from=TransitionTerminal
@@ -926,7 +958,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//TransitionTerminal
 		public RuleCall getFromTransitionTerminalParserRuleCall_3_0() { return cFromTransitionTerminalParserRuleCall_3_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_4() { return cHyphenMinusGreaterThanSignKeyword_4; }
 
 		//to=TransitionTerminal
@@ -941,16 +973,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_6_0() { return cDocuDocumentationParserRuleCall_6_0; }
 
-		//("{" ("action" action=DetailCode)? "}")?
+		//('{' ('action' action=DetailCode)? '}')?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_7_0() { return cLeftCurlyBracketKeyword_7_0; }
 
-		//("action" action=DetailCode)?
+		//('action' action=DetailCode)?
 		public Group getGroup_7_1() { return cGroup_7_1; }
 
-		//"action"
+		//'action'
 		public Keyword getActionKeyword_7_1_0() { return cActionKeyword_7_1_0; }
 
 		//action=DetailCode
@@ -959,12 +991,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getActionDetailCodeParserRuleCall_7_1_1_0() { return cActionDetailCodeParserRuleCall_7_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7_2() { return cRightCurlyBracketKeyword_7_2; }
 	}
 
 	public class TriggeredTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TriggeredTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TriggeredTransition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cTransitionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -994,15 +1026,20 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_14 = (Keyword)cGroup.eContents().get(14);
 		
 		//TriggeredTransition:
-		//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{"
-		//	triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}";
-		public ParserRule getRule() { return rule; }
-
-		//"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{"
-		//triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}"
+		//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+		//	docu=Documentation?
+		//	'{'
+		//	'triggers' '{'
+		//	triggers+=Trigger ('or' triggers+=Trigger)*
+		//	'}' ('action' action=DetailCode)?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal docu=Documentation? '{' 'triggers' '{'
+		//triggers+=Trigger ('or' triggers+=Trigger)* '}' ('action' action=DetailCode)? '}'
 		public Group getGroup() { return cGroup; }
 
-		//"Transition"
+		//'Transition'
 		public Keyword getTransitionKeyword_0() { return cTransitionKeyword_0; }
 
 		//name=ID?
@@ -1011,7 +1048,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//from=TransitionTerminal
@@ -1020,7 +1057,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//TransitionTerminal
 		public RuleCall getFromTransitionTerminalParserRuleCall_3_0() { return cFromTransitionTerminalParserRuleCall_3_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_4() { return cHyphenMinusGreaterThanSignKeyword_4; }
 
 		//to=TransitionTerminal
@@ -1035,13 +1072,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_6_0() { return cDocuDocumentationParserRuleCall_6_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_7() { return cLeftCurlyBracketKeyword_7; }
 
-		//"triggers"
+		//'triggers'
 		public Keyword getTriggersKeyword_8() { return cTriggersKeyword_8; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_9() { return cLeftCurlyBracketKeyword_9; }
 
 		//triggers+=Trigger
@@ -1050,10 +1087,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Trigger
 		public RuleCall getTriggersTriggerParserRuleCall_10_0() { return cTriggersTriggerParserRuleCall_10_0; }
 
-		//("or" triggers+=Trigger)*
+		//('or' triggers+=Trigger)*
 		public Group getGroup_11() { return cGroup_11; }
 
-		//"or"
+		//'or'
 		public Keyword getOrKeyword_11_0() { return cOrKeyword_11_0; }
 
 		//triggers+=Trigger
@@ -1062,13 +1099,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Trigger
 		public RuleCall getTriggersTriggerParserRuleCall_11_1_0() { return cTriggersTriggerParserRuleCall_11_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_12() { return cRightCurlyBracketKeyword_12; }
 
-		//("action" action=DetailCode)?
+		//('action' action=DetailCode)?
 		public Group getGroup_13() { return cGroup_13; }
 
-		//"action"
+		//'action'
 		public Keyword getActionKeyword_13_0() { return cActionKeyword_13_0; }
 
 		//action=DetailCode
@@ -1077,12 +1114,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getActionDetailCodeParserRuleCall_13_1_0() { return cActionDetailCodeParserRuleCall_13_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_14() { return cRightCurlyBracketKeyword_14; }
 	}
 
 	public class GuardedTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GuardedTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.GuardedTransition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cTransitionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1106,15 +1143,18 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);
 		
 		//GuardedTransition:
-		//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard"
-		//	guard=DetailCode ("action" action=DetailCode)? "}";
-		public ParserRule getRule() { return rule; }
-
-		//"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard"
-		//guard=DetailCode ("action" action=DetailCode)? "}"
+		//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+		//	docu=Documentation?
+		//	'{'
+		//	'guard' guard=DetailCode ('action' action=DetailCode)?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal docu=Documentation? '{' 'guard'
+		//guard=DetailCode ('action' action=DetailCode)? '}'
 		public Group getGroup() { return cGroup; }
 
-		//"Transition"
+		//'Transition'
 		public Keyword getTransitionKeyword_0() { return cTransitionKeyword_0; }
 
 		//name=ID?
@@ -1123,7 +1163,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//from=TransitionTerminal
@@ -1132,7 +1172,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//TransitionTerminal
 		public RuleCall getFromTransitionTerminalParserRuleCall_3_0() { return cFromTransitionTerminalParserRuleCall_3_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_4() { return cHyphenMinusGreaterThanSignKeyword_4; }
 
 		//to=TransitionTerminal
@@ -1147,10 +1187,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_6_0() { return cDocuDocumentationParserRuleCall_6_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_7() { return cLeftCurlyBracketKeyword_7; }
 
-		//"guard"
+		//'guard'
 		public Keyword getGuardKeyword_8() { return cGuardKeyword_8; }
 
 		//guard=DetailCode
@@ -1159,10 +1199,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getGuardDetailCodeParserRuleCall_9_0() { return cGuardDetailCodeParserRuleCall_9_0; }
 
-		//("action" action=DetailCode)?
+		//('action' action=DetailCode)?
 		public Group getGroup_10() { return cGroup_10; }
 
-		//"action"
+		//'action'
 		public Keyword getActionKeyword_10_0() { return cActionKeyword_10_0; }
 
 		//action=DetailCode
@@ -1171,12 +1211,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getActionDetailCodeParserRuleCall_10_1_0() { return cActionDetailCodeParserRuleCall_10_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_11() { return cRightCurlyBracketKeyword_11; }
 	}
 
 	public class CPBranchTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CPBranchTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.CPBranchTransition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cTransitionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1200,15 +1240,18 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);
 		
 		//CPBranchTransition:
-		//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond"
-		//	condition=DetailCode ("action" action=DetailCode)? "}";
-		public ParserRule getRule() { return rule; }
-
-		//"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond"
-		//condition=DetailCode ("action" action=DetailCode)? "}"
+		//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+		//	docu=Documentation?
+		//	'{'
+		//	'cond' condition=DetailCode ('action' action=DetailCode)?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal docu=Documentation? '{' 'cond'
+		//condition=DetailCode ('action' action=DetailCode)? '}'
 		public Group getGroup() { return cGroup; }
 
-		//"Transition"
+		//'Transition'
 		public Keyword getTransitionKeyword_0() { return cTransitionKeyword_0; }
 
 		//name=ID?
@@ -1217,7 +1260,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//from=TransitionTerminal
@@ -1226,7 +1269,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//TransitionTerminal
 		public RuleCall getFromTransitionTerminalParserRuleCall_3_0() { return cFromTransitionTerminalParserRuleCall_3_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_4() { return cHyphenMinusGreaterThanSignKeyword_4; }
 
 		//to=TransitionTerminal
@@ -1241,10 +1284,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_6_0() { return cDocuDocumentationParserRuleCall_6_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_7() { return cLeftCurlyBracketKeyword_7; }
 
-		//"cond"
+		//'cond'
 		public Keyword getCondKeyword_8() { return cCondKeyword_8; }
 
 		//condition=DetailCode
@@ -1253,10 +1296,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getConditionDetailCodeParserRuleCall_9_0() { return cConditionDetailCodeParserRuleCall_9_0; }
 
-		//("action" action=DetailCode)?
+		//('action' action=DetailCode)?
 		public Group getGroup_10() { return cGroup_10; }
 
-		//"action"
+		//'action'
 		public Keyword getActionKeyword_10_0() { return cActionKeyword_10_0; }
 
 		//action=DetailCode
@@ -1265,12 +1308,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getActionDetailCodeParserRuleCall_10_1_0() { return cActionDetailCodeParserRuleCall_10_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_11() { return cRightCurlyBracketKeyword_11; }
 	}
 
 	public class RefinedTransitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefinedTransition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRefinedTransitionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTargetAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1286,13 +1329,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//// by validation RefinedTransition can only be contained in the top level state graph
 		//RefinedTransition:
-		//	"RefinedTransition" target=[Transition|FQN] docu=Documentation? "{" "action" action=DetailCode "}";
-		public ParserRule getRule() { return rule; }
+		//	'RefinedTransition' target=[Transition|FQN] docu=Documentation?
+		//	'{'
+		//	'action' action=DetailCode
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"RefinedTransition" target=[Transition|FQN] docu=Documentation? "{" "action" action=DetailCode "}"
+		//'RefinedTransition' target=[Transition|FQN] docu=Documentation? '{' 'action' action=DetailCode '}'
 		public Group getGroup() { return cGroup; }
 
-		//"RefinedTransition"
+		//'RefinedTransition'
 		public Keyword getRefinedTransitionKeyword_0() { return cRefinedTransitionKeyword_0; }
 
 		//target=[Transition|FQN]
@@ -1310,10 +1356,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
-		//"action"
+		//'action'
 		public Keyword getActionKeyword_4() { return cActionKeyword_4; }
 
 		//action=DetailCode
@@ -1322,12 +1368,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getActionDetailCodeParserRuleCall_5_0() { return cActionDetailCodeParserRuleCall_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class TransitionTerminalElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TransitionTerminal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cStateTerminalParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cTrPointTerminalParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -1339,7 +1385,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		////
 		//TransitionTerminal:
 		//	StateTerminal | TrPointTerminal | SubStateTrPointTerminal | ChoicepointTerminal;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//StateTerminal | TrPointTerminal | SubStateTrPointTerminal | ChoicepointTerminal
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1358,14 +1404,14 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StateTerminalElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StateTerminal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.StateTerminal");
 		private final Assignment cStateAssignment = (Assignment)rule.eContents().get(1);
 		private final CrossReference cStateStateCrossReference_0 = (CrossReference)cStateAssignment.eContents().get(0);
 		private final RuleCall cStateStateIDTerminalRuleCall_0_1 = (RuleCall)cStateStateCrossReference_0.eContents().get(1);
 		
 		//StateTerminal:
 		//	state=[State];
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//state=[State]
 		public Assignment getStateAssignment() { return cStateAssignment; }
@@ -1378,7 +1424,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class TrPointTerminalElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TrPointTerminal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.TrPointTerminal");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cMyKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTrPointAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1386,13 +1432,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cTrPointTrPointIDTerminalRuleCall_1_0_1 = (RuleCall)cTrPointTrPointCrossReference_1_0.eContents().get(1);
 		
 		//TrPointTerminal:
-		//	"my" trPoint=[TrPoint];
-		public ParserRule getRule() { return rule; }
+		//	'my' trPoint=[TrPoint];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"my" trPoint=[TrPoint]
+		//'my' trPoint=[TrPoint]
 		public Group getGroup() { return cGroup; }
 
-		//"my"
+		//'my'
 		public Keyword getMyKeyword_0() { return cMyKeyword_0; }
 
 		//trPoint=[TrPoint]
@@ -1406,7 +1452,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SubStateTrPointTerminalElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubStateTrPointTerminal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.SubStateTrPointTerminal");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTrPointAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cTrPointTrPointCrossReference_0_0 = (CrossReference)cTrPointAssignment_0.eContents().get(0);
@@ -1417,10 +1463,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cStateStateIDTerminalRuleCall_2_0_1 = (RuleCall)cStateStateCrossReference_2_0.eContents().get(1);
 		
 		//SubStateTrPointTerminal:
-		//	trPoint=[TrPoint] "of" state=[State];
-		public ParserRule getRule() { return rule; }
+		//	trPoint=[TrPoint] 'of' state=[State];
+		@Override public ParserRule getRule() { return rule; }
 
-		//trPoint=[TrPoint] "of" state=[State]
+		//trPoint=[TrPoint] 'of' state=[State]
 		public Group getGroup() { return cGroup; }
 
 		//trPoint=[TrPoint]
@@ -1432,7 +1478,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getTrPointTrPointIDTerminalRuleCall_0_0_1() { return cTrPointTrPointIDTerminalRuleCall_0_0_1; }
 
-		//"of"
+		//'of'
 		public Keyword getOfKeyword_1() { return cOfKeyword_1; }
 
 		//state=[State]
@@ -1446,7 +1492,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ChoicepointTerminalElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ChoicepointTerminal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ChoicepointTerminal");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCpKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cCpAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1454,13 +1500,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cCpChoicePointIDTerminalRuleCall_1_0_1 = (RuleCall)cCpChoicePointCrossReference_1_0.eContents().get(1);
 		
 		//ChoicepointTerminal:
-		//	"cp" cp=[ChoicePoint];
-		public ParserRule getRule() { return rule; }
+		//	'cp' cp=[ChoicePoint];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"cp" cp=[ChoicePoint]
+		//'cp' cp=[ChoicePoint]
 		public Group getGroup() { return cGroup; }
 
-		//"cp"
+		//'cp'
 		public Keyword getCpKeyword_0() { return cCpKeyword_0; }
 
 		//cp=[ChoicePoint]
@@ -1474,7 +1520,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class TriggerElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Trigger");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.Trigger");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLessThanSignKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cMsgFromIfPairsAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1491,13 +1537,14 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//// transition triggers
 		////
 		//Trigger:
-		//	"<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">";
-		public ParserRule getRule() { return rule; }
+		//	'<' msgFromIfPairs+=MessageFromIf ('|' msgFromIfPairs+=MessageFromIf)*
+		//	guard=Guard? '>';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">"
+		//'<' msgFromIfPairs+=MessageFromIf ('|' msgFromIfPairs+=MessageFromIf)* guard=Guard? '>'
 		public Group getGroup() { return cGroup; }
 
-		//"<"
+		//'<'
 		public Keyword getLessThanSignKeyword_0() { return cLessThanSignKeyword_0; }
 
 		//msgFromIfPairs+=MessageFromIf
@@ -1506,10 +1553,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//MessageFromIf
 		public RuleCall getMsgFromIfPairsMessageFromIfParserRuleCall_1_0() { return cMsgFromIfPairsMessageFromIfParserRuleCall_1_0; }
 
-		//("|" msgFromIfPairs+=MessageFromIf)*
+		//('|' msgFromIfPairs+=MessageFromIf)*
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"|"
+		//'|'
 		public Keyword getVerticalLineKeyword_2_0() { return cVerticalLineKeyword_2_0; }
 
 		//msgFromIfPairs+=MessageFromIf
@@ -1524,12 +1571,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//Guard
 		public RuleCall getGuardGuardParserRuleCall_3_0() { return cGuardGuardParserRuleCall_3_0; }
 
-		//">"
+		//'>'
 		public Keyword getGreaterThanSignKeyword_4() { return cGreaterThanSignKeyword_4; }
 	}
 
 	public class MessageFromIfElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MessageFromIf");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cMessageAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cMessageEObjectCrossReference_0_0 = (CrossReference)cMessageAssignment_0.eContents().get(0);
@@ -1543,10 +1590,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//// pairs of (message, interface) are triggering events
 		////
 		//MessageFromIf:
-		//	message=[ecore::EObject] ":" from=[AbstractInterfaceItem];
-		public ParserRule getRule() { return rule; }
+		//	message=[ecore::EObject] ':' from=[AbstractInterfaceItem];
+		@Override public ParserRule getRule() { return rule; }
 
-		//message=[ecore::EObject] ":" from=[AbstractInterfaceItem]
+		//message=[ecore::EObject] ':' from=[AbstractInterfaceItem]
 		public Group getGroup() { return cGroup; }
 
 		//message=[ecore::EObject]
@@ -1558,7 +1605,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getMessageEObjectIDTerminalRuleCall_0_0_1() { return cMessageEObjectIDTerminalRuleCall_0_0_1; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1() { return cColonKeyword_1; }
 
 		//from=[AbstractInterfaceItem]
@@ -1572,14 +1619,14 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class AbstractInterfaceItemElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AbstractInterfaceItem");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.AbstractInterfaceItem");
 		private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cNameIDTerminalRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
 		
 		//// AbstractMessage: name=ID; --> ecore::EObject
 		//AbstractInterfaceItem:
 		//	name=ID;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//name=ID
 		public Assignment getNameAssignment() { return cNameAssignment; }
@@ -1589,20 +1636,20 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class GuardElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Guard");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.Guard");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cGuardKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cGuardAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cGuardDetailCodeParserRuleCall_1_0 = (RuleCall)cGuardAssignment_1.eContents().get(0);
 		
 		//Guard:
-		//	"guard" guard=DetailCode;
-		public ParserRule getRule() { return rule; }
+		//	'guard' guard=DetailCode;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"guard" guard=DetailCode
+		//'guard' guard=DetailCode
 		public Group getGroup() { return cGroup; }
 
-		//"guard"
+		//'guard'
 		public Keyword getGuardKeyword_0() { return cGuardKeyword_0; }
 
 		//guard=DetailCode
@@ -1613,7 +1660,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ProtocolSemanticsElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ProtocolSemantics");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ProtocolSemantics");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cProtocolSemanticsAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cSemanticsKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1626,19 +1673,22 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//// semantics for state machine validation
 		////
 		//ProtocolSemantics:
-		//	{ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}";
-		public ParserRule getRule() { return rule; }
+		//	{ProtocolSemantics}
+		//	'semantics' '{'
+		//	rules+=SemanticsRule*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//{ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}"
+		//{ProtocolSemantics} 'semantics' '{' rules+=SemanticsRule* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{ProtocolSemantics}
 		public Action getProtocolSemanticsAction_0() { return cProtocolSemanticsAction_0; }
 
-		//"semantics"
+		//'semantics'
 		public Keyword getSemanticsKeyword_1() { return cSemanticsKeyword_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//rules+=SemanticsRule*
@@ -1647,19 +1697,19 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getRulesSemanticsRuleParserRuleCall_3_0() { return cRulesSemanticsRuleParserRuleCall_3_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class SemanticsRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SemanticsRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cInSemanticsRuleParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cOutSemanticsRuleParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//SemanticsRule:
 		//	InSemanticsRule | OutSemanticsRule;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//InSemanticsRule | OutSemanticsRule
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1672,7 +1722,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class InSemanticsRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InSemanticsRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.InSemanticsRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cInKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1695,18 +1745,18 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightParenthesisKeyword_3_1_1_3 = (Keyword)cGroup_3_1_1.eContents().get(3);
 		
 		//InSemanticsRule:
-		//	"in" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-		//	followUps+=SemanticsRule)+ ")"))?;
-		public ParserRule getRule() { return rule; }
+		//	'in' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule
+		//	| '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"in" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-		//followUps+=SemanticsRule)+ ")"))?
+		//'in' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule | '(' followUps+=SemanticsRule (','
+		//followUps+=SemanticsRule)+ ')'))?
 		public Group getGroup() { return cGroup; }
 
-		//"in"
+		//'in'
 		public Keyword getInKeyword_0() { return cInKeyword_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1() { return cColonKeyword_1; }
 
 		//msg=[ecore::EObject]
@@ -1718,13 +1768,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getMsgEObjectIDTerminalRuleCall_2_0_1() { return cMsgEObjectIDTerminalRuleCall_2_0_1; }
 
-		//("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ ")"))?
+		//('->' (followUps+=SemanticsRule | '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_3_0() { return cHyphenMinusGreaterThanSignKeyword_3_0; }
 
-		//followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ ")"
+		//(followUps+=SemanticsRule | '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')')
 		public Alternatives getAlternatives_3_1() { return cAlternatives_3_1; }
 
 		//followUps+=SemanticsRule
@@ -1733,10 +1783,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0() { return cFollowUpsSemanticsRuleParserRuleCall_3_1_0_0; }
 
-		//"(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ ")"
+		//'(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'
 		public Group getGroup_3_1_1() { return cGroup_3_1_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_3_1_1_0() { return cLeftParenthesisKeyword_3_1_1_0; }
 
 		//followUps+=SemanticsRule
@@ -1745,10 +1795,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0() { return cFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0; }
 
-		//("," followUps+=SemanticsRule)+
+		//(',' followUps+=SemanticsRule)+
 		public Group getGroup_3_1_1_2() { return cGroup_3_1_1_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_1_1_2_0() { return cCommaKeyword_3_1_1_2_0; }
 
 		//followUps+=SemanticsRule
@@ -1757,12 +1807,12 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0() { return cFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_3_1_1_3() { return cRightParenthesisKeyword_3_1_1_3; }
 	}
 
 	public class OutSemanticsRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OutSemanticsRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.OutSemanticsRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cOutKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1785,18 +1835,18 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightParenthesisKeyword_3_1_1_3 = (Keyword)cGroup_3_1_1.eContents().get(3);
 		
 		//OutSemanticsRule:
-		//	"out" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-		//	followUps+=SemanticsRule)+ ")"))?;
-		public ParserRule getRule() { return rule; }
+		//	'out' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule
+		//	| '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"out" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-		//followUps+=SemanticsRule)+ ")"))?
+		//'out' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule | '(' followUps+=SemanticsRule (','
+		//followUps+=SemanticsRule)+ ')'))?
 		public Group getGroup() { return cGroup; }
 
-		//"out"
+		//'out'
 		public Keyword getOutKeyword_0() { return cOutKeyword_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1() { return cColonKeyword_1; }
 
 		//msg=[ecore::EObject]
@@ -1808,13 +1858,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getMsgEObjectIDTerminalRuleCall_2_0_1() { return cMsgEObjectIDTerminalRuleCall_2_0_1; }
 
-		//("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ ")"))?
+		//('->' (followUps+=SemanticsRule | '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_3_0() { return cHyphenMinusGreaterThanSignKeyword_3_0; }
 
-		//followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ ")"
+		//(followUps+=SemanticsRule | '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')')
 		public Alternatives getAlternatives_3_1() { return cAlternatives_3_1; }
 
 		//followUps+=SemanticsRule
@@ -1823,10 +1873,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0() { return cFollowUpsSemanticsRuleParserRuleCall_3_1_0_0; }
 
-		//"(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ ")"
+		//'(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'
 		public Group getGroup_3_1_1() { return cGroup_3_1_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_3_1_1_0() { return cLeftParenthesisKeyword_3_1_1_0; }
 
 		//followUps+=SemanticsRule
@@ -1835,10 +1885,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0() { return cFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0; }
 
-		//("," followUps+=SemanticsRule)+
+		//(',' followUps+=SemanticsRule)+
 		public Group getGroup_3_1_1_2() { return cGroup_3_1_1_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_1_1_2_0() { return cCommaKeyword_3_1_1_2_0; }
 
 		//followUps+=SemanticsRule
@@ -1847,13 +1897,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		//SemanticsRule
 		public RuleCall getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0() { return cFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_3_1_1_3() { return cRightParenthesisKeyword_3_1_1_3; }
 	}
 	
 	
 	public class ComponentCommunicationTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ComponentCommunicationType");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.fsm.FSM.ComponentCommunicationType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cEVENT_DRIVENEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cEVENT_DRIVENEventdrivenKeyword_0_0 = (Keyword)cEVENT_DRIVENEnumLiteralDeclaration_0.eContents().get(0);
@@ -1864,41 +1914,43 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		private final EnumLiteralDeclaration cSYNCHRONOUSEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
 		private final Keyword cSYNCHRONOUSSyncKeyword_3_0 = (Keyword)cSYNCHRONOUSEnumLiteralDeclaration_3.eContents().get(0);
 		
-		//// the state machine communication type
 		//enum ComponentCommunicationType:
-		//	EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | ASYNCHRONOUS="async" | SYNCHRONOUS="sync";
+		//	EVENT_DRIVEN='eventdriven' |
+		//	DATA_DRIVEN='datadriven' |
+		//	ASYNCHRONOUS='async' |
+		//	SYNCHRONOUS='sync';
 		public EnumRule getRule() { return rule; }
 
-		//EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | ASYNCHRONOUS="async" | SYNCHRONOUS="sync"
+		//EVENT_DRIVEN='eventdriven' | DATA_DRIVEN='datadriven' | ASYNCHRONOUS='async' | SYNCHRONOUS='sync'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//EVENT_DRIVEN="eventdriven"
+		//EVENT_DRIVEN='eventdriven'
 		public EnumLiteralDeclaration getEVENT_DRIVENEnumLiteralDeclaration_0() { return cEVENT_DRIVENEnumLiteralDeclaration_0; }
 
-		//"eventdriven"
+		//'eventdriven'
 		public Keyword getEVENT_DRIVENEventdrivenKeyword_0_0() { return cEVENT_DRIVENEventdrivenKeyword_0_0; }
 
-		//DATA_DRIVEN="datadriven"
+		//DATA_DRIVEN='datadriven'
 		public EnumLiteralDeclaration getDATA_DRIVENEnumLiteralDeclaration_1() { return cDATA_DRIVENEnumLiteralDeclaration_1; }
 
-		//"datadriven"
+		//'datadriven'
 		public Keyword getDATA_DRIVENDatadrivenKeyword_1_0() { return cDATA_DRIVENDatadrivenKeyword_1_0; }
 
-		//ASYNCHRONOUS="async"
+		//ASYNCHRONOUS='async'
 		public EnumLiteralDeclaration getASYNCHRONOUSEnumLiteralDeclaration_2() { return cASYNCHRONOUSEnumLiteralDeclaration_2; }
 
-		//"async"
+		//'async'
 		public Keyword getASYNCHRONOUSAsyncKeyword_2_0() { return cASYNCHRONOUSAsyncKeyword_2_0; }
 
-		//SYNCHRONOUS="sync"
+		//SYNCHRONOUS='sync'
 		public EnumLiteralDeclaration getSYNCHRONOUSEnumLiteralDeclaration_3() { return cSYNCHRONOUSEnumLiteralDeclaration_3; }
 
-		//"sync"
+		//'sync'
 		public Keyword getSYNCHRONOUSSyncKeyword_3_0() { return cSYNCHRONOUSSyncKeyword_3_0; }
 	}
 	
 	private final FSMModelElements pFSMModel;
-	private final ComponentCommunicationTypeElements unknownRuleComponentCommunicationType;
+	private final ComponentCommunicationTypeElements eComponentCommunicationType;
 	private final ModelComponentElements pModelComponent;
 	private final StateGraphNodeElements pStateGraphNode;
 	private final StateGraphItemElements pStateGraphItem;
@@ -1913,6 +1965,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	private final EntryPointElements pEntryPoint;
 	private final ExitPointElements pExitPoint;
 	private final ChoicePointElements pChoicePoint;
+	private final TransitionBaseElements pTransitionBase;
 	private final TransitionElements pTransition;
 	private final NonInitialTransitionElements pNonInitialTransition;
 	private final TransitionChainStartTransitionElements pTransitionChainStartTransition;
@@ -1940,13 +1993,17 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 
 	private final BaseGrammarAccess gaBase;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public FSMGrammarAccess(GrammarProvider grammarProvider,
-		BaseGrammarAccess gaBase) {
+		BaseGrammarAccess gaBase,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaBase = gaBase;
+		this.gaTerminals = gaTerminals;
 		this.pFSMModel = new FSMModelElements();
-		this.unknownRuleComponentCommunicationType = new ComponentCommunicationTypeElements();
+		this.eComponentCommunicationType = new ComponentCommunicationTypeElements();
 		this.pModelComponent = new ModelComponentElements();
 		this.pStateGraphNode = new StateGraphNodeElements();
 		this.pStateGraphItem = new StateGraphItemElements();
@@ -1961,6 +2018,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		this.pEntryPoint = new EntryPointElements();
 		this.pExitPoint = new ExitPointElements();
 		this.pChoicePoint = new ChoicePointElements();
+		this.pTransitionBase = new TransitionBaseElements();
 		this.pTransition = new TransitionElements();
 		this.pNonInitialTransition = new NonInitialTransitionElements();
 		this.pTransitionChainStartTransition = new TransitionChainStartTransitionElements();
@@ -2001,7 +2059,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -2011,6 +2069,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return gaBase;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//FSMModel:
 	//	components+=ModelComponent*;
@@ -2022,11 +2084,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return getFSMModelAccess().getRule();
 	}
 
-	//// the state machine communication type
 	//enum ComponentCommunicationType:
-	//	EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | ASYNCHRONOUS="async" | SYNCHRONOUS="sync";
+	//	EVENT_DRIVEN='eventdriven' |
+	//	DATA_DRIVEN='datadriven' |
+	//	ASYNCHRONOUS='async' |
+	//	SYNCHRONOUS='sync';
 	public ComponentCommunicationTypeElements getComponentCommunicationTypeAccess() {
-		return unknownRuleComponentCommunicationType;
+		return eComponentCommunicationType;
 	}
 	
 	public EnumRule getComponentCommunicationTypeRule() {
@@ -2035,8 +2099,9 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 
 	//// the owner of a state machine. It also implements inheritance
 	//ModelComponent:
-	//	(abstract?="abstract"? & commType=ComponentCommunicationType?) "ModelComponent" componentName=ID ("extends"
-	//	base=[ModelComponent|FQN])? stateMachine=StateMachine;
+	//	(abstract?='abstract'? & commType=ComponentCommunicationType?)
+	//	'ModelComponent' componentName=ID ('extends' base=[ModelComponent|FQN])?
+	//	stateMachine=StateMachine;
 	public ModelComponentElements getModelComponentAccess() {
 		return pModelComponent;
 	}
@@ -2071,8 +2136,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 
 	//// state graph and state machine are two rules for the same model class
 	//StateGraph:
-	//	{StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
-	//	refinedTransitions+=RefinedTransition)* "}";
+	//	{StateGraph}
+	//	'{' (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
+	//	refinedTransitions+=RefinedTransition)*
+	//	'}';
 	public StateGraphElements getStateGraphAccess() {
 		return pStateGraph;
 	}
@@ -2081,9 +2148,11 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return getStateGraphAccess().getRule();
 	}
 
-	//StateMachine returns StateGraph:
-	//	{StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition
-	//	| refinedTransitions+=RefinedTransition)* "}";
+	//StateMachine StateGraph:
+	//	{StateGraph}
+	//	'StateMachine' '{' (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition |
+	//	refinedTransitions+=RefinedTransition)*
+	//	'}'
 	public StateMachineElements getStateMachineAccess() {
 		return pStateMachine;
 	}
@@ -2106,8 +2175,9 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SimpleState:
-	//	"State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do"
-	//	doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?;
+	//	'State' name=ID docu=Documentation? ('{' ('entry' entryCode=DetailCode)? ('exit' exitCode=DetailCode)? ('do'
+	//	doCode=DetailCode)? ('subgraph' subgraph=StateGraph)?
+	//	'}')?;
 	public SimpleStateElements getSimpleStateAccess() {
 		return pSimpleState;
 	}
@@ -2117,8 +2187,9 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefinedState:
-	//	"RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit"
-	//	exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}";
+	//	'RefinedState' target=[State|FQN] docu=Documentation? '{' ('entry' entryCode=DetailCode)? ('exit'
+	//	exitCode=DetailCode)? ('do' doCode=DetailCode)? ('subgraph' subgraph=StateGraph)?
+	//	'}';
 	public RefinedStateElements getRefinedStateAccess() {
 		return pRefinedState;
 	}
@@ -2130,7 +2201,9 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// the detail level (or target language) code
 	//// the used flag might be used when overriding in derived grammars
 	//DetailCode:
-	//	{DetailCode} used?="{" lines+=STRING* "}";
+	//	{DetailCode} used?='{'
+	//	lines+=STRING*
+	//	'}';
 	public DetailCodeElements getDetailCodeAccess() {
 		return pDetailCode;
 	}
@@ -2153,7 +2226,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//TransitionPoint:
-	//	handler?="handler"? "TransitionPoint" name=ID;
+	//	handler?='handler'? 'TransitionPoint' name=ID;
 	public TransitionPointElements getTransitionPointAccess() {
 		return pTransitionPoint;
 	}
@@ -2163,7 +2236,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EntryPoint:
-	//	"EntryPoint" name=ID;
+	//	'EntryPoint' name=ID;
 	public EntryPointElements getEntryPointAccess() {
 		return pEntryPoint;
 	}
@@ -2173,7 +2246,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ExitPoint:
-	//	"ExitPoint" name=ID;
+	//	'ExitPoint' name=ID;
 	public ExitPointElements getExitPointAccess() {
 		return pExitPoint;
 	}
@@ -2186,7 +2259,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// choice point
 	////
 	//ChoicePoint:
-	//	"ChoicePoint" name=ID docu=Documentation?;
+	//	'ChoicePoint' name=ID docu=Documentation?;
 	public ChoicePointElements getChoicePointAccess() {
 		return pChoicePoint;
 	}
@@ -2198,6 +2271,16 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	////
 	//// transitions
 	////
+	//TransitionBase:
+	//	Transition | RefinedTransition;
+	public TransitionBaseElements getTransitionBaseAccess() {
+		return pTransitionBase;
+	}
+	
+	public ParserRule getTransitionBaseRule() {
+		return getTransitionBaseAccess().getRule();
+	}
+
 	//Transition:
 	//	InitialTransition | NonInitialTransition;
 	public TransitionElements getTransitionAccess() {
@@ -2229,8 +2312,9 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//InitialTransition:
-	//	"Transition" name=ID? ":" "initial" "->" to=TransitionTerminal docu=Documentation? ("{" ("action" action=DetailCode)?
-	//	"}")?;
+	//	'Transition' name=ID? ':' 'initial' '->' to=TransitionTerminal
+	//	docu=Documentation? ('{' ('action' action=DetailCode)?
+	//	'}')?;
 	public InitialTransitionElements getInitialTransitionAccess() {
 		return pInitialTransition;
 	}
@@ -2240,8 +2324,9 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ContinuationTransition:
-	//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action"
-	//	action=DetailCode)? "}")?;
+	//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+	//	docu=Documentation? ('{' ('action' action=DetailCode)?
+	//	'}')?;
 	public ContinuationTransitionElements getContinuationTransitionAccess() {
 		return pContinuationTransition;
 	}
@@ -2251,8 +2336,13 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//TriggeredTransition:
-	//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{"
-	//	triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}";
+	//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+	//	docu=Documentation?
+	//	'{'
+	//	'triggers' '{'
+	//	triggers+=Trigger ('or' triggers+=Trigger)*
+	//	'}' ('action' action=DetailCode)?
+	//	'}';
 	public TriggeredTransitionElements getTriggeredTransitionAccess() {
 		return pTriggeredTransition;
 	}
@@ -2262,8 +2352,11 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//GuardedTransition:
-	//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard"
-	//	guard=DetailCode ("action" action=DetailCode)? "}";
+	//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+	//	docu=Documentation?
+	//	'{'
+	//	'guard' guard=DetailCode ('action' action=DetailCode)?
+	//	'}';
 	public GuardedTransitionElements getGuardedTransitionAccess() {
 		return pGuardedTransition;
 	}
@@ -2273,8 +2366,11 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//CPBranchTransition:
-	//	"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond"
-	//	condition=DetailCode ("action" action=DetailCode)? "}";
+	//	'Transition' name=ID? ':' from=TransitionTerminal '->' to=TransitionTerminal
+	//	docu=Documentation?
+	//	'{'
+	//	'cond' condition=DetailCode ('action' action=DetailCode)?
+	//	'}';
 	public CPBranchTransitionElements getCPBranchTransitionAccess() {
 		return pCPBranchTransition;
 	}
@@ -2285,7 +2381,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 
 	//// by validation RefinedTransition can only be contained in the top level state graph
 	//RefinedTransition:
-	//	"RefinedTransition" target=[Transition|FQN] docu=Documentation? "{" "action" action=DetailCode "}";
+	//	'RefinedTransition' target=[Transition|FQN] docu=Documentation?
+	//	'{'
+	//	'action' action=DetailCode
+	//	'}';
 	public RefinedTransitionElements getRefinedTransitionAccess() {
 		return pRefinedTransition;
 	}
@@ -2318,7 +2417,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//TrPointTerminal:
-	//	"my" trPoint=[TrPoint];
+	//	'my' trPoint=[TrPoint];
 	public TrPointTerminalElements getTrPointTerminalAccess() {
 		return pTrPointTerminal;
 	}
@@ -2328,7 +2427,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubStateTrPointTerminal:
-	//	trPoint=[TrPoint] "of" state=[State];
+	//	trPoint=[TrPoint] 'of' state=[State];
 	public SubStateTrPointTerminalElements getSubStateTrPointTerminalAccess() {
 		return pSubStateTrPointTerminal;
 	}
@@ -2338,7 +2437,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ChoicepointTerminal:
-	//	"cp" cp=[ChoicePoint];
+	//	'cp' cp=[ChoicePoint];
 	public ChoicepointTerminalElements getChoicepointTerminalAccess() {
 		return pChoicepointTerminal;
 	}
@@ -2351,7 +2450,8 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// transition triggers
 	////
 	//Trigger:
-	//	"<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">";
+	//	'<' msgFromIfPairs+=MessageFromIf ('|' msgFromIfPairs+=MessageFromIf)*
+	//	guard=Guard? '>';
 	public TriggerElements getTriggerAccess() {
 		return pTrigger;
 	}
@@ -2364,7 +2464,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// pairs of (message, interface) are triggering events
 	////
 	//MessageFromIf:
-	//	message=[ecore::EObject] ":" from=[AbstractInterfaceItem];
+	//	message=[ecore::EObject] ':' from=[AbstractInterfaceItem];
 	public MessageFromIfElements getMessageFromIfAccess() {
 		return pMessageFromIf;
 	}
@@ -2385,7 +2485,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Guard:
-	//	"guard" guard=DetailCode;
+	//	'guard' guard=DetailCode;
 	public GuardElements getGuardAccess() {
 		return pGuard;
 	}
@@ -2398,7 +2498,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// semantics for state machine validation
 	////
 	//ProtocolSemantics:
-	//	{ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}";
+	//	{ProtocolSemantics}
+	//	'semantics' '{'
+	//	rules+=SemanticsRule*
+	//	'}';
 	public ProtocolSemanticsElements getProtocolSemanticsAccess() {
 		return pProtocolSemantics;
 	}
@@ -2418,8 +2521,8 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//InSemanticsRule:
-	//	"in" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-	//	followUps+=SemanticsRule)+ ")"))?;
+	//	'in' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule
+	//	| '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?;
 	public InSemanticsRuleElements getInSemanticsRuleAccess() {
 		return pInSemanticsRule;
 	}
@@ -2429,8 +2532,8 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//OutSemanticsRule:
-	//	"out" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-	//	followUps+=SemanticsRule)+ ")"))?;
+	//	'out' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule
+	//	| '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?;
 	public OutSemanticsRuleElements getOutSemanticsRuleAccess() {
 		return pOutSemanticsRule;
 	}
@@ -2442,7 +2545,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// AnnotationType and Annotation Rules
 	//Annotation:
-	//	"@" type=[AnnotationType|FQN] ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?;
+	//	'@' type=[AnnotationType|FQN] ('(' attributes+=KeyValue (',' attributes+=KeyValue)* ')')?;
 	public BaseGrammarAccess.AnnotationElements getAnnotationAccess() {
 		return gaBase.getAnnotationAccess();
 	}
@@ -2452,7 +2555,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public BaseGrammarAccess.KeyValueElements getKeyValueAccess() {
 		return gaBase.getKeyValueAccess();
 	}
@@ -2462,8 +2565,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//AnnotationType:
-	//	"AnnotationType" name=ID docu=Documentation? "{" "target" "=" (targets+=AnnotationTargetType | "{"
-	//	targets+=AnnotationTargetType ("," targets+=AnnotationTargetType)* "}") attributes+=AnnotationAttribute* "}";
+	//	'AnnotationType' name=ID docu=Documentation? '{'
+	//	'target' '=' (targets+=AnnotationTargetType | '{' targets+=AnnotationTargetType (',' targets+=AnnotationTargetType)*
+	//	'}') attributes+=AnnotationAttribute*
+	//	'}';
 	public BaseGrammarAccess.AnnotationTypeElements getAnnotationTypeAccess() {
 		return gaBase.getAnnotationTypeAccess();
 	}
@@ -2501,7 +2606,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SimpleAnnotationAttribute:
-	//	(optional?="optional" | "mandatory") "attribute" name=ID ":" type=LiteralType;
+	//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' type=LiteralType;
 	public BaseGrammarAccess.SimpleAnnotationAttributeElements getSimpleAnnotationAttributeAccess() {
 		return gaBase.getSimpleAnnotationAttributeAccess();
 	}
@@ -2511,7 +2616,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EnumAnnotationAttribute:
-	//	(optional?="optional" | "mandatory") "attribute" name=ID ":" "{" values+=STRING ("," values+=STRING)* "}";
+	//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' '{' values+=STRING (',' values+=STRING)* '}';
 	public BaseGrammarAccess.EnumAnnotationAttributeElements getEnumAnnotationAttributeAccess() {
 		return gaBase.getEnumAnnotationAttributeAccess();
 	}
@@ -2541,7 +2646,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// the attribute 'importedNamespace' is picked up by the ImportedNamespaceAwareLocalScopeProvider
 	//// the attribute 'importURI' is picked up by the ImportUriGlobalScopeProvider
 	//Import:
-	//	"import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING;
+	//	'import' (importedNamespace=ImportedFQN 'from' | 'model') importURI=STRING;
 	public BaseGrammarAccess.ImportElements getImportAccess() {
 		return gaBase.getImportAccess();
 	}
@@ -2551,7 +2656,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public BaseGrammarAccess.ImportedFQNElements getImportedFQNAccess() {
 		return gaBase.getImportedFQNAccess();
 	}
@@ -2563,7 +2668,10 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public BaseGrammarAccess.DocumentationElements getDocumentationAccess() {
 		return gaBase.getDocumentationAccess();
 	}
@@ -2574,8 +2682,8 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 
 	//// **************************************************************
 	//// Time Rule
-	//TIME returns ecore::ELong:
-	//	INT "s" | INT "ms" | INT "us" | INT "ns";
+	//TIME ecore::ELong:
+	//	INT 's' | INT 'ms' | INT 'us' | INT 'ns'
 	public BaseGrammarAccess.TIMEElements getTIMEAccess() {
 		return gaBase.getTIMEAccess();
 	}
@@ -2584,10 +2692,11 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return getTIMEAccess().getRule();
 	}
 
-	//// **************************************************************
-	//// Literal Rules
 	//enum LiteralType:
-	//	BOOL="ptBoolean" | INT="ptInteger" | REAL="ptReal" | CHAR="ptCharacter";
+	//	BOOL='ptBoolean' |
+	//	INT='ptInteger' |
+	//	REAL='ptReal' |
+	//	CHAR='ptCharacter';
 	public BaseGrammarAccess.LiteralTypeElements getLiteralTypeAccess() {
 		return gaBase.getLiteralTypeAccess();
 	}
@@ -2597,7 +2706,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public BaseGrammarAccess.LiteralArrayElements getLiteralArrayAccess() {
 		return gaBase.getLiteralArrayAccess();
 	}
@@ -2618,7 +2727,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BaseGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaBase.getBooleanLiteralAccess();
 	}
@@ -2667,8 +2776,8 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public BaseGrammarAccess.IntegerElements getIntegerAccess() {
 		return gaBase.getIntegerAccess();
 	}
@@ -2677,8 +2786,8 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 		return getIntegerAccess().getRule();
 	}
 
-	//Real returns ecore::EDouble:
-	//	Decimal | / *DotDecimal | DecimalDot |* / DecimalExp;
+	//Real ecore::EDouble:
+	//	Decimal | DecimalExp
 	public BaseGrammarAccess.RealElements getRealAccess() {
 		return gaBase.getRealAccess();
 	}
@@ -2688,7 +2797,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public BaseGrammarAccess.DecimalElements getDecimalAccess() {
 		return gaBase.getDecimalAccess();
 	}
@@ -2703,7 +2812,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public BaseGrammarAccess.DecimalExpElements getDecimalExpAccess() {
 		return gaBase.getDecimalExpAccess();
 	}
@@ -2713,7 +2822,7 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public BaseGrammarAccess.FQNElements getFQNAccess() {
 		return gaBase.getFQNAccess();
 	}
@@ -2723,51 +2832,50 @@ public class FSMGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//terminal HEX:
-	//	("0x" | "0X") ("0".."9" | "a".."f" | "A".."F")+;
+	//	('0x' | '0X') ('0'..'9' | 'a'..'f' | 'A'..'F')+;
 	public TerminalRule getHEXRule() {
 		return gaBase.getHEXRule();
 	} 
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
-		return gaBase.getIDRule();
+		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
-		return gaBase.getINTRule();
+		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
-		return gaBase.getSTRINGRule();
+		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/ *'->'* /';
 	public TerminalRule getML_COMMENTRule() {
-		return gaBase.getML_COMMENTRule();
+		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaBase.getSL_COMMENTRule();
+		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaBase.getWSRule();
+		return gaTerminals.getWSRule();
 	} 
 
 	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaBase.getANY_OTHERRule();
+		return gaTerminals.getANY_OTHERRule();
 	} 
 }
diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/validation/AbstractFSMJavaValidator.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/validation/AbstractFSMJavaValidator.java
index 4abc7a50e..246f37597 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/validation/AbstractFSMJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/validation/AbstractFSMJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.validation;
  
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/FSM.xtext b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/FSM.xtext
index e22794260..9736caad1 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/FSM.xtext
+++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/FSM.xtext
@@ -124,6 +124,7 @@ ChoicePoint:
 // transitions
 //
 
+TransitionBase: Transition | RefinedTransition;
 Transition: InitialTransition | NonInitialTransition;
 NonInitialTransition: TransitionChainStartTransition | ContinuationTransition | CPBranchTransition;
 TransitionChainStartTransition: TriggeredTransition | GuardedTransition;